fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013

xserver          commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485
libX11           commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea
glproto          commit aacc7a51b6161c765b04524e0d2ab31e5e586834
fontconfig       commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab
mesa             commit b16b3c8703f198ca0f025b730d582600df79c19c

133 files changed, 5799 insertions, 43039 deletions

diff --git a/fontconfig/src/fcdefault.c b/fontconfig/src/fcdefault.c
index d1b917fd9..c6397c0c2 100644
--- a/fontconfig/src/fcdefault.c
+++ b/fontconfig/src/fcdefault.c
@@ -219,7 +219,7 @@ FcDefaultSubstitute (FcPattern *pattern)
     int	    i;
 
     if (FcPatternObjectGet (pattern, FC_WEIGHT_OBJECT, 0, &v) == FcResultNoMatch )
-	FcPatternObjectAddInteger (pattern, FC_WEIGHT_OBJECT, FC_WEIGHT_MEDIUM);
+	FcPatternObjectAddInteger (pattern, FC_WEIGHT_OBJECT, FC_WEIGHT_NORMAL);
 
     if (FcPatternObjectGet (pattern, FC_SLANT_OBJECT, 0, &v) == FcResultNoMatch)
 	FcPatternObjectAddInteger (pattern, FC_SLANT_OBJECT, FC_SLANT_ROMAN);
diff --git a/gl/configure.ac b/gl/configure.ac
index f522b46b8..04511930e 100644
--- a/gl/configure.ac
+++ b/gl/configure.ac
@@ -8,5 +8,6 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.3)
 XORG_DEFAULT_OPTIONS
 
-AC_OUTPUT([Makefile
+AC_CONFIG_FILES([Makefile
            glproto.pc])
+AC_OUTPUT
diff --git a/libX11/src/xcms/cmsColNm.c b/libX11/src/xcms/cmsColNm.c
index ecf19b37e..ab6e4e879 100644
--- a/libX11/src/xcms/cmsColNm.c
+++ b/libX11/src/xcms/cmsColNm.c
@@ -314,7 +314,7 @@ field2(
 
     /* Find Field 1 */
     while (!isgraph(*pBuf)) {
-	if ((*pBuf != '\n') || (*pBuf != '\0')) {
+	if ((*pBuf == '\n') || (*pBuf == '\0')) {
 	    return(XcmsFailure);
 	}
 	if (isspace(*pBuf) || (*pBuf == delim)) {
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 91b9871d7..f94c9b979 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -1005,21 +1005,14 @@ if test "x$enable_dri" = xyes; then
     DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`
 
     # Check for expat
-    EXPAT_INCLUDES=""
-    EXPAT_LIB=-lexpat
-    AC_ARG_WITH([expat],
-        [AS_HELP_STRING([--with-expat=DIR],
-            [expat install directory])],[
-        EXPAT_INCLUDES="-I$withval/include"
-        CPPFLAGS="$CPPFLAGS $EXPAT_INCLUDES"
-        LDFLAGS="$LDFLAGS -L$withval/$LIB_DIR"
-        EXPAT_LIB="-L$withval/$LIB_DIR -lexpat"
-        ])
-    AC_CHECK_HEADER([expat.h],[],[AC_MSG_ERROR([Expat required for DRI.])])
-    save_LIBS="$LIBS"
-    AC_CHECK_LIB([expat],[XML_ParserCreate],[],
-        [AC_MSG_ERROR([Expat required for DRI.])])
-    LIBS="$save_LIBS"
+    PKG_CHECK_EXISTS([EXPAT], [have_expat=yes], [have_expat=no])
+    if test "x$have_expat" = "xyes"; then
+       PKG_CHECK_MODULES([EXPAT], [expat], [],
+                         AC_MSG_ERROR([Expat required for DRI.]))
+    else
+       # expat version 2.0 and earlier do not provide expat.pc
+       EXPAT_LIBS=-lexpat
+    fi
 
     # If we are building any DRI driver other than swrast.
     if test -n "$DRI_DIRS"; then
@@ -1035,8 +1028,8 @@ if test "x$enable_dri" = xyes; then
     fi
 
     # put all the necessary libs together
-    DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm $PTHREAD_LIBS $DLOPEN_LIBS"
-    GALLIUM_DRI_LIB_DEPS="$GALLIUM_DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm $CLOCK_LIB $PTHREAD_LIBS $DLOPEN_LIBS"
+    DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
+    GALLIUM_DRI_LIB_DEPS="$GALLIUM_DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIBS -lm $CLOCK_LIB $PTHREAD_LIBS $DLOPEN_LIBS"
 
     DRI_DRIVER_LDFLAGS="-module -avoid-version -shared -Wl,-Bsymbolic"
 fi
@@ -1045,7 +1038,6 @@ AM_CONDITIONAL(NEED_MEGADRIVER, test -n "$DRI_DIRS")
 AM_CONDITIONAL(NEED_LIBMESA, test "x$enable_xlib_glx" = xyes -o \
                                   "x$enable_osmesa" = xyes -o \
                                   -n "$DRI_DIRS")
-AC_SUBST([EXPAT_INCLUDES])
 AC_SUBST([DRI_LIB_DEPS])
 AC_SUBST([DRI_DRIVER_LDFLAGS])
 AC_SUBST([GALLIUM_DRI_LIB_DEPS])
@@ -1358,8 +1350,8 @@ if test "x$enable_opencl" = xyes; then
                     PKG_CONFIG_PATH environment variable.
                     By default libclc.pc is installed to /usr/local/share/pkgconfig/])
     else
-        LIBCLC_INCLUDEDIR=`pkg-config --variable=includedir libclc`
-        LIBCLC_LIBEXECDIR=`pkg-config --variable=libexecdir libclc`
+        LIBCLC_INCLUDEDIR=`$PKG_CONFIG --variable=includedir libclc`
+        LIBCLC_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir libclc`
         AC_SUBST([LIBCLC_INCLUDEDIR])
         AC_SUBST([LIBCLC_LIBEXECDIR])
     fi
diff --git a/mesalib/src/gallium/auxiliary/Makefile.sources b/mesalib/src/gallium/auxiliary/Makefile.sources
index acbcef7e2..c89cbddd0 100644
--- a/mesalib/src/gallium/auxiliary/Makefile.sources
+++ b/mesalib/src/gallium/auxiliary/Makefile.sources
@@ -43,6 +43,7 @@ C_SOURCES := \
 	hud/hud_cpu.c \
 	hud/hud_fps.c \
         hud/hud_driver_query.c \
+	indices/u_primconvert.c \
 	os/os_misc.c \
 	os/os_process.c \
 	os/os_time.c \
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.c b/mesalib/src/gallium/auxiliary/util/u_format.c
index a8aa5719d..9ef3bb53f 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.c
+++ b/mesalib/src/gallium/auxiliary/util/u_format.c
@@ -208,6 +208,47 @@ util_format_is_supported(enum pipe_format format, unsigned bind)
 }
 
 
+/**
+ * Calculates the MRD for the depth format. MRD is used in depth bias
+ * for UNORM and unbound depth buffers. When the depth buffer is floating
+ * point, the depth bias calculation does not use the MRD. However, the
+ * default MRD will be 1.0 / ((1 << 24) - 1).
+ */
+double
+util_get_depth_format_mrd(enum pipe_format format)
+{
+   struct util_format_description *format_desc;
+   /*
+    * Depth buffer formats without a depth component OR scenarios
+    * without a bound depth buffer default to D24.
+    */
+   double mrd = 1.0 / ((1 << 24) - 1);
+   unsigned depth_channel;
+
+   format_desc = (struct util_format_description *)
+                     util_format_description(format);
+
+   assert(format_desc);
+
+   /*
+    * Some depth formats do not store the depth component in the first
+    * channel, detect the format and adjust the depth channel. Get the
+    * swizzled depth component channel.
+    */
+   depth_channel = format_desc->swizzle[0];
+
+   if (format_desc->channel[depth_channel].type == UTIL_FORMAT_TYPE_UNSIGNED &&
+       format_desc->channel[depth_channel].normalized) {
+      int depth_bits;
+
+      depth_bits = format_desc->channel[depth_channel].size;
+      mrd = 1.0 / ((1ULL << depth_bits) - 1);
+   }
+
+   return mrd;
+}
+
+
 void
 util_format_read_4f(enum pipe_format format,
                     float *dst, unsigned dst_stride,
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.h b/mesalib/src/gallium/auxiliary/util/u_format.h
index 84f16d503..dc777c35c 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.h
+++ b/mesalib/src/gallium/auxiliary/util/u_format.h
@@ -544,6 +544,17 @@ util_format_is_depth_and_stencil(enum pipe_format format)
           util_format_has_stencil(desc);
 }
 
+
+/**
+ * Calculates the MRD for the depth format. MRD is used in depth bias
+ * for UNORM and unbound depth buffers. When the depth buffer is floating
+ * point, the depth bias calculation does not use the MRD. However, the
+ * default MRD will be 1.0 / ((1 << 24) - 1).
+ */
+double
+util_get_depth_format_mrd(enum pipe_format format);
+
+
 /**
  * Return whether this is an RGBA, Z, S, or combined ZS format.
  * Useful for initializing pipe_blit_info::mask.
diff --git a/mesalib/src/glsl/ast_array_index.cpp b/mesalib/src/glsl/ast_array_index.cpp
index b457ec899..f7b5e8350 100644
--- a/mesalib/src/glsl/ast_array_index.cpp
+++ b/mesalib/src/glsl/ast_array_index.cpp
@@ -143,7 +143,7 @@ _mesa_ast_array_index_to_hir(void *mem_ctx,
 	    bound = array->type->vector_elements;
 	 }
       } else {
-	 /* glsl_type::array_size() returns 0 for non-array types.  This means
+	 /* glsl_type::array_size() returns -1 for non-array types.  This means
 	  * that we don't need to verify that the type is an array before
 	  * doing the bounds checking.
 	  */
@@ -165,7 +165,7 @@ _mesa_ast_array_index_to_hir(void *mem_ctx,
       if (array->type->is_array())
          update_max_array_access(array, idx, &loc, state);
    } else if (const_index == NULL && array->type->is_array()) {
-      if (array->type->array_size() == 0) {
+      if (array->type->is_unsized_array()) {
 	 _mesa_glsl_error(&loc, state, "unsized array index must be constant");
       } else if (array->type->fields.array->is_interface()
                  && array->variable_referenced()->mode == ir_var_uniform) {
diff --git a/mesalib/src/glsl/ast_function.cpp b/mesalib/src/glsl/ast_function.cpp
index 02aad4f8f..2707522ef 100644
--- a/mesalib/src/glsl/ast_function.cpp
+++ b/mesalib/src/glsl/ast_function.cpp
@@ -732,21 +732,21 @@ process_array_constructor(exec_list *instructions,
    exec_list actual_parameters;
    const unsigned parameter_count =
       process_parameters(instructions, &actual_parameters, parameters, state);
+   bool is_unsized_array = constructor_type->is_unsized_array();
 
-   if ((parameter_count == 0)
-       || ((constructor_type->length != 0)
-	   && (constructor_type->length != parameter_count))) {
-      const unsigned min_param = (constructor_type->length == 0)
-	 ? 1 : constructor_type->length;
+   if ((parameter_count == 0) ||
+       (!is_unsized_array && (constructor_type->length != parameter_count))) {
+      const unsigned min_param = is_unsized_array
+         ? 1 : constructor_type->length;
 
       _mesa_glsl_error(loc, state, "array constructor must have %s %u "
 		       "parameter%s",
-		       (constructor_type->length == 0) ? "at least" : "exactly",
+		       is_unsized_array ? "at least" : "exactly",
 		       min_param, (min_param <= 1) ? "" : "s");
       return ir_rvalue::error_value(ctx);
    }
 
-   if (constructor_type->length == 0) {
+   if (is_unsized_array) {
       constructor_type =
 	 glsl_type::get_array_instance(constructor_type->element_type(),
 				       parameter_count);
diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index 3551a5956..f75e68ce1 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -675,8 +675,8 @@ shift_result_type(const struct glsl_type *type_a,
  */
 ir_rvalue *
 validate_assignment(struct _mesa_glsl_parse_state *state,
-		    const glsl_type *lhs_type, ir_rvalue *rhs,
-		    bool is_initializer)
+                    YYLTYPE loc, const glsl_type *lhs_type,
+                    ir_rvalue *rhs, bool is_initializer)
 {
    /* If there is already some error in the RHS, just return it.  Anything
     * else will lead to an avalanche of error message back to the user.
@@ -689,16 +689,15 @@ validate_assignment(struct _mesa_glsl_parse_state *state,
    if (rhs->type == lhs_type)
       return rhs;
 
-   /* If the array element types are the same and the size of the LHS is zero,
+   /* If the array element types are the same and the LHS is unsized,
     * the assignment is okay for initializers embedded in variable
     * declarations.
     *
     * Note: Whole-array assignments are not permitted in GLSL 1.10, but this
     * is handled by ir_dereference::is_lvalue.
     */
-   if (is_initializer && lhs_type->is_array() && rhs->type->is_array()
-       && (lhs_type->element_type() == rhs->type->element_type())
-       && (lhs_type->array_size() == 0)) {
+   if (is_initializer && lhs_type->is_unsized_array() && rhs->type->is_array()
+       && (lhs_type->element_type() == rhs->type->element_type())) {
       return rhs;
    }
 
@@ -708,6 +707,12 @@ validate_assignment(struct _mesa_glsl_parse_state *state,
 	 return rhs;
    }
 
+   _mesa_glsl_error(&loc, state,
+                    "%s of type %s cannot be assigned to "
+                    "variable of type %s",
+                    is_initializer ? "initializer" : "value",
+                    rhs->type->name, lhs_type->name);
+
    return NULL;
 }
 
@@ -738,10 +743,10 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
 
       if (unlikely(expr->operation == ir_binop_vector_extract)) {
          ir_rvalue *new_rhs =
-            validate_assignment(state, lhs->type, rhs, is_initializer);
+            validate_assignment(state, lhs_loc, lhs->type,
+                                rhs, is_initializer);
 
          if (new_rhs == NULL) {
-            _mesa_glsl_error(& lhs_loc, state, "type mismatch");
             return lhs;
          } else {
             rhs = new(ctx) ir_expression(ir_triop_vector_insert,
@@ -790,10 +795,8 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
    }
 
    ir_rvalue *new_rhs =
-      validate_assignment(state, lhs->type, rhs, is_initializer);
-   if (new_rhs == NULL) {
-      _mesa_glsl_error(& lhs_loc, state, "type mismatch");
-   } else {
+      validate_assignment(state, lhs_loc, lhs->type, rhs, is_initializer);
+   if (new_rhs != NULL) {
       rhs = new_rhs;
 
       /* If the LHS array was not declared with a size, it takes it size from
@@ -801,7 +804,7 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
        * dereference of a variable.  Any other case would require that the LHS
        * is either not an l-value or not a whole array.
        */
-      if (lhs->type->array_size() == 0) {
+      if (lhs->type->is_unsized_array()) {
 	 ir_dereference *const d = lhs->as_dereference();
 
 	 assert(d != NULL);
@@ -940,6 +943,7 @@ do_comparison(void *mem_ctx, int operation, ir_rvalue *op0, ir_rvalue *op1)
    case GLSL_TYPE_VOID:
    case GLSL_TYPE_SAMPLER:
    case GLSL_TYPE_INTERFACE:
+   case GLSL_TYPE_ATOMIC_UINT:
       /* I assume a comparison of a struct containing a sampler just
        * ignores the sampler present in the type.
        */
@@ -1234,6 +1238,10 @@ ast_expression::hir(exec_list *instructions,
                  !state->check_version(120, 300, &loc,
                                        "array comparisons forbidden")) {
 	 error_emitted = true;
+      } else if ((op[0]->type->contains_opaque() ||
+                  op[1]->type->contains_opaque())) {
+         _mesa_glsl_error(&loc, state, "opaque type comparisons forbidden");
+         error_emitted = true;
       }
 
       if (error_emitted) {
@@ -2039,6 +2047,96 @@ interpret_interpolation_qualifier(const struct ast_type_qualifier *qual,
 
 
 static void
+validate_explicit_location(const struct ast_type_qualifier *qual,
+                           ir_variable *var,
+                           struct _mesa_glsl_parse_state *state,
+                           YYLTYPE *loc)
+{
+   bool fail = false;
+
+   /* In the vertex shader only shader inputs can be given explicit
+    * locations.
+    *
+    * In the fragment shader only shader outputs can be given explicit
+    * locations.
+    */
+   switch (state->target) {
+   case vertex_shader:
+      if (var->mode == ir_var_shader_in) {
+         if (!state->check_explicit_attrib_location_allowed(loc, var))
+            return;
+
+         break;
+      }
+
+      fail = true;
+      break;
+
+   case geometry_shader:
+      _mesa_glsl_error(loc, state,
+                       "geometry shader variables cannot be given "
+                       "explicit locations");
+      return;
+
+   case fragment_shader:
+      if (var->mode == ir_var_shader_out) {
+         if (!state->check_explicit_attrib_location_allowed(loc, var))
+            return;
+
+         break;
+      }
+
+      fail = true;
+      break;
+   };
+
+   if (fail) {
+      _mesa_glsl_error(loc, state,
+                       "%s cannot be given an explicit location in %s shader",
+                       mode_string(var),
+		       _mesa_glsl_shader_target_name(state->target));
+   } else {
+      var->explicit_location = true;
+
+      /* This bit of silliness is needed because invalid explicit locations
+       * are supposed to be flagged during linking.  Small negative values
+       * biased by VERT_ATTRIB_GENERIC0 or FRAG_RESULT_DATA0 could alias
+       * built-in values (e.g., -16+VERT_ATTRIB_GENERIC0 = VERT_ATTRIB_POS).
+       * The linker needs to be able to differentiate these cases.  This
+       * ensures that negative values stay negative.
+       */
+      if (qual->location >= 0) {
+         var->location = (state->target == vertex_shader)
+            ? (qual->location + VERT_ATTRIB_GENERIC0)
+            : (qual->location + FRAG_RESULT_DATA0);
+      } else {
+         var->location = qual->location;
+      }
+
+      if (qual->flags.q.explicit_index) {
+         /* From the GLSL 4.30 specification, section 4.4.2 (Output
+          * Layout Qualifiers):
+          *
+          * "It is also a compile-time error if a fragment shader
+          *  sets a layout index to less than 0 or greater than 1."
+          *
+          * Older specifications don't mandate a behavior; we take
+          * this as a clarification and always generate the error.
+          */
+         if (qual->index < 0 || qual->index > 1) {
+            _mesa_glsl_error(loc, state,
+                             "explicit index may only be 0 or 1");
+         } else {
+            var->explicit_index = true;
+            var->index = qual->index;
+         }
+      }
+   }
+
+   return;
+}
+
+static void
 apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
 				 ir_variable *var,
 				 struct _mesa_glsl_parse_state *state,
@@ -2190,81 +2288,7 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
    }
 
    if (qual->flags.q.explicit_location) {
-      const bool global_scope = (state->current_function == NULL);
-      bool fail = false;
-      const char *string = "";
-
-      /* In the vertex shader only shader inputs can be given explicit
-       * locations.
-       *
-       * In the fragment shader only shader outputs can be given explicit
-       * locations.
-       */
-      switch (state->target) {
-      case vertex_shader:
-	 if (!global_scope || (var->mode != ir_var_shader_in)) {
-	    fail = true;
-	    string = "input";
-	 }
-	 break;
-
-      case geometry_shader:
-	 _mesa_glsl_error(loc, state,
-			  "geometry shader variables cannot be given "
-			  "explicit locations");
-	 break;
-
-      case fragment_shader:
-	 if (!global_scope || (var->mode != ir_var_shader_out)) {
-	    fail = true;
-	    string = "output";
-	 }
-	 break;
-      };
-
-      if (fail) {
-	 _mesa_glsl_error(loc, state,
-			  "only %s shader %s variables can be given an "
-			  "explicit location",
-			  _mesa_glsl_shader_target_name(state->target),
-			  string);
-      } else {
-	 var->explicit_location = true;
-
-	 /* This bit of silliness is needed because invalid explicit locations
-	  * are supposed to be flagged during linking.  Small negative values
-	  * biased by VERT_ATTRIB_GENERIC0 or FRAG_RESULT_DATA0 could alias
-	  * built-in values (e.g., -16+VERT_ATTRIB_GENERIC0 = VERT_ATTRIB_POS).
-	  * The linker needs to be able to differentiate these cases.  This
-	  * ensures that negative values stay negative.
-	  */
-	 if (qual->location >= 0) {
-	    var->location = (state->target == vertex_shader)
-	       ? (qual->location + VERT_ATTRIB_GENERIC0)
-	       : (qual->location + FRAG_RESULT_DATA0);
-	 } else {
-	    var->location = qual->location;
-	 }
-
-	 if (qual->flags.q.explicit_index) {
-            /* From the GLSL 4.30 specification, section 4.4.2 (Output
-             * Layout Qualifiers):
-             *
-             * "It is also a compile-time error if a fragment shader
-             *  sets a layout index to less than 0 or greater than 1."
-             *
-             * Older specifications don't mandate a behavior; we take
-             * this as a clarification and always generate the error.
-             */
-            if (qual->index < 0 || qual->index > 1) {
-               _mesa_glsl_error(loc, state,
-                                "explicit index may only be 0 or 1");
-            } else {
-               var->explicit_index = true;
-               var->index = qual->index;
-            }
-	 }
-      }
+      validate_explicit_location(qual, var, state, loc);
    } else if (qual->flags.q.explicit_index) {
 	 _mesa_glsl_error(loc, state,
 			  "explicit index requires explicit location");
@@ -2403,8 +2427,7 @@ get_variable_being_redeclared(ir_variable *var, YYLTYPE loc,
     *  later re-declare the same name as an array of the same
     *  type and specify a size."
     */
-   if ((earlier->type->array_size() == 0)
-       && var->type->is_array()
+   if (earlier->type->is_unsized_array() && var->type->is_array()
        && (var->type->element_type() == earlier->type->element_type())) {
       /* FINISHME: This doesn't match the qualifiers on the two
        * FINISHME: declarations.  It's not 100% clear whether this is
@@ -2547,7 +2570,8 @@ process_initializer(ir_variable *var, ast_declaration *decl,
     */
    if (type->qualifier.flags.q.constant
        || type->qualifier.flags.q.uniform) {
-      ir_rvalue *new_rhs = validate_assignment(state, var->type, rhs, true);
+      ir_rvalue *new_rhs = validate_assignment(state, initializer_loc,
+                                               var->type, rhs, true);
       if (new_rhs != NULL) {
 	 rhs = new_rhs;
 
@@ -2576,10 +2600,6 @@ process_initializer(ir_variable *var, ast_declaration *decl,
 	    var->constant_value = constant_value;
 	 }
       } else {
-	 _mesa_glsl_error(&initializer_loc, state,
-			  "initializer of type %s cannot be assigned to "
-			  "variable of type %s",
-			  rhs->type->name, var->type->name);
 	 if (var->type->is_numeric()) {
 	    /* Reduce cascading errors. */
 	    var->constant_value = ir_constant::zero(state, var->type);
@@ -2659,7 +2679,7 @@ handle_geometry_shader_input_decl(struct _mesa_glsl_parse_state *state,
       return;
    }
 
-   if (var->type->length == 0) {
+   if (var->type->is_unsized_array()) {
       /* Section 4.3.8.1 (Input Layout Qualifiers) of the GLSL 1.50 spec says:
        *
        *   All geometry shader input unsized array declarations will be
@@ -3308,7 +3328,7 @@ ast_declarator_list::hir(exec_list *instructions,
 	 const glsl_type *const t = (earlier == NULL)
 	    ? var->type : earlier->type;
 
-         if (t->is_array() && t->length == 0)
+         if (t->is_unsized_array())
             /* Section 10.17 of the GLSL ES 1.00 specification states that
              * unsized array declarations have been removed from the language.
              * Arrays that are sized using an initializer are still explicitly
@@ -3441,7 +3461,7 @@ ast_parameter_declarator::hir(exec_list *instructions,
       type = process_array_type(&loc, type, this->array_size, state);
    }
 
-   if (!type->is_error() && type->array_size() == 0) {
+   if (!type->is_error() && type->is_unsized_array()) {
       _mesa_glsl_error(&loc, state, "arrays passed as parameters must have "
 		       "a declared size");
       type = glsl_type::error_type;
@@ -3613,7 +3633,7 @@ ast_function::hir(exec_list *instructions,
     *     "Arrays are allowed as arguments and as the return type. In both
     *     cases, the array must be explicitly sized."
     */
-   if (return_type->is_array() && return_type->length == 0) {
+   if (return_type->is_unsized_array()) {
       YYLTYPE loc = this->get_location();
       _mesa_glsl_error(& loc, state,
 		       "function `%s' return type array must be explicitly "
@@ -5099,10 +5119,8 @@ ast_gs_input_layout::hir(exec_list *instructions,
       /* Note: gl_PrimitiveIDIn has mode ir_var_shader_in, but it's not an
        * array; skip it.
        */
-      if (!var->type->is_array())
-         continue;
 
-      if (var->type->length == 0) {
+      if (var->type->is_unsized_array()) {
          if (var->max_array_access >= num_vertices) {
             _mesa_glsl_error(&loc, state,
                              "this geometry shader input layout implies %u"
diff --git a/mesalib/src/glsl/builtin_functions.cpp b/mesalib/src/glsl/builtin_functions.cpp
index d40888d38..3fa0cb5ad 100644
--- a/mesalib/src/glsl/builtin_functions.cpp
+++ b/mesalib/src/glsl/builtin_functions.cpp
@@ -277,6 +277,17 @@ texture_gather(const _mesa_glsl_parse_state *state)
           state->ARB_gpu_shader5_enable;
 }
 
+/* Only ARB_texture_gather but not GLSL 4.0 or ARB_gpu_shader5.
+ * used for relaxation of const offset requirements.
+ */
+static bool
+texture_gather_only(const _mesa_glsl_parse_state *state)
+{
+   return !state->is_version(400, 0) &&
+          !state->ARB_gpu_shader5_enable &&
+          state->ARB_texture_gather_enable;
+}
+
 /* Desktop GL or OES_standard_derivatives + fragment shader only */
 static bool
 fs_oes_derivatives(const _mesa_glsl_parse_state *state)
@@ -315,6 +326,13 @@ tex3d_lod(const _mesa_glsl_parse_state *state)
 {
    return tex3d(state) && lod_exists_in_stage(state);
 }
+
+static bool
+shader_atomic_counters(const _mesa_glsl_parse_state *state)
+{
+   return state->ARB_shader_atomic_counters_enable;
+}
+
 /** @} */
 
 /******************************************************************************/
@@ -354,6 +372,7 @@ private:
    ir_variable *gl_Vertex;
 
    void create_shader();
+   void create_intrinsics();
    void create_builtins();
 
    /**
@@ -375,6 +394,14 @@ private:
 
    ir_expression *asin_expr(ir_variable *x);
 
+   /**
+    * Call function \param f with parameters specified as the linked
+    * list \param params of \c ir_variable objects.  \param ret should
+    * point to the ir_variable that will hold the function return
+    * value, or be \c NULL if the function has void return type.
+    */
+   ir_call *call(ir_function *f, ir_variable *ret, exec_list params);
+
    /** Create a new function and add the given signatures. */
    void add_function(const char *name, ...);
 
@@ -495,6 +522,8 @@ private:
 #define TEX_PROJECT 1
 #define TEX_OFFSET  2
 #define TEX_COMPONENT 4
+#define TEX_OFFSET_NONCONST 8
+#define TEX_OFFSET_ARRAY 16
 
    ir_function_signature *_texture(ir_texture_opcode opcode,
                                    builtin_available_predicate avail,
@@ -534,6 +563,11 @@ private:
    B1(uaddCarry)
    B1(usubBorrow)
    B1(mulExtended)
+
+   ir_function_signature *_atomic_intrinsic(builtin_available_predicate avail);
+   ir_function_signature *_atomic_op(const char *intrinsic,
+                                     builtin_available_predicate avail);
+
 #undef B0
 #undef B1
 #undef B2
@@ -596,6 +630,7 @@ builtin_builder::initialize()
 
    mem_ctx = ralloc_context(NULL);
    create_shader();
+   create_intrinsics();
    create_builtins();
 }
 
@@ -633,6 +668,24 @@ builtin_builder::create_shader()
 /** @} */
 
 /**
+ * Create ir_function and ir_function_signature objects for each
+ * intrinsic.
+ */
+void
+builtin_builder::create_intrinsics()
+{
+   add_function("__intrinsic_atomic_read",
+                _atomic_intrinsic(shader_atomic_counters),
+                NULL);
+   add_function("__intrinsic_atomic_increment",
+                _atomic_intrinsic(shader_atomic_counters),
+                NULL);
+   add_function("__intrinsic_atomic_predecrement",
+                _atomic_intrinsic(shader_atomic_counters),
+                NULL);
+}
+
+/**
  * Create ir_function and ir_function_signature objects for each built-in.
  *
  * Contains a list of every available built-in.
@@ -1909,16 +1962,80 @@ builtin_builder::create_builtins()
                 _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::samplerCubeArray_type, glsl_type::vec4_type, TEX_COMPONENT),
                 _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isamplerCubeArray_type, glsl_type::vec4_type, TEX_COMPONENT),
                 _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usamplerCubeArray_type, glsl_type::vec4_type, TEX_COMPONENT),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec2_type),
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DArrayShadow_type, glsl_type::vec3_type),
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::samplerCubeShadow_type, glsl_type::vec3_type),
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::samplerCubeArrayShadow_type, glsl_type::vec4_type),
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DRectShadow_type, glsl_type::vec2_type),
                 NULL);
 
    add_function("textureGatherOffset",
-                _texture(ir_tg4, texture_gather, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type, TEX_OFFSET),
-                _texture(ir_tg4, texture_gather, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec2_type, TEX_OFFSET),
-                _texture(ir_tg4, texture_gather, glsl_type::uvec4_type, glsl_type::usampler2D_type, glsl_type::vec2_type, TEX_OFFSET),
+                _texture(ir_tg4, texture_gather_only, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type, TEX_OFFSET),
+                _texture(ir_tg4, texture_gather_only, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec2_type, TEX_OFFSET),
+                _texture(ir_tg4, texture_gather_only, glsl_type::uvec4_type, glsl_type::usampler2D_type, glsl_type::vec2_type, TEX_OFFSET),
+
+                _texture(ir_tg4, texture_gather_only, glsl_type::vec4_type, glsl_type::sampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET),
+                _texture(ir_tg4, texture_gather_only, glsl_type::ivec4_type, glsl_type::isampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET),
+                _texture(ir_tg4, texture_gather_only, glsl_type::uvec4_type, glsl_type::usampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST),
+                _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST),
+                _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usampler2D_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET_NONCONST),
+                _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET_NONCONST),
+                _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET_NONCONST),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DRect_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST),
+                _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isampler2DRect_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST),
+                _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usampler2DRect_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST | TEX_COMPONENT),
+                _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST | TEX_COMPONENT),
+                _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usampler2D_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST | TEX_COMPONENT),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET_NONCONST | TEX_COMPONENT),
+                _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET_NONCONST | TEX_COMPONENT),
+                _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET_NONCONST | TEX_COMPONENT),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DRect_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST | TEX_COMPONENT),
+                _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isampler2DRect_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST | TEX_COMPONENT),
+                _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usampler2DRect_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST | TEX_COMPONENT),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST),
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DArrayShadow_type, glsl_type::vec3_type, TEX_OFFSET_NONCONST),
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DRectShadow_type, glsl_type::vec2_type, TEX_OFFSET_NONCONST),
+                NULL);
+
+   add_function("textureGatherOffsets",
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY),
+                _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY),
+                _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usampler2D_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY | TEX_COMPONENT),
+                _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY | TEX_COMPONENT),
+                _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usampler2D_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY | TEX_COMPONENT),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET_ARRAY),
+                _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET_ARRAY),
+                _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET_ARRAY),
 
-                _texture(ir_tg4, texture_gather, glsl_type::vec4_type, glsl_type::sampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET),
-                _texture(ir_tg4, texture_gather, glsl_type::ivec4_type, glsl_type::isampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET),
-                _texture(ir_tg4, texture_gather, glsl_type::uvec4_type, glsl_type::usampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET),
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET_ARRAY | TEX_COMPONENT),
+                _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET_ARRAY | TEX_COMPONENT),
+                _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET_ARRAY | TEX_COMPONENT),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DRect_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY),
+                _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isampler2DRect_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY),
+                _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usampler2DRect_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DRect_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY | TEX_COMPONENT),
+                _texture(ir_tg4, gpu_shader5, glsl_type::ivec4_type, glsl_type::isampler2DRect_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY | TEX_COMPONENT),
+                _texture(ir_tg4, gpu_shader5, glsl_type::uvec4_type, glsl_type::usampler2DRect_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY | TEX_COMPONENT),
+
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY),
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DArrayShadow_type, glsl_type::vec3_type, TEX_OFFSET_ARRAY),
+                _texture(ir_tg4, gpu_shader5, glsl_type::vec4_type, glsl_type::sampler2DRectShadow_type, glsl_type::vec2_type, TEX_OFFSET_ARRAY),
                 NULL);
 
    F(dFdx)
@@ -1974,6 +2091,20 @@ builtin_builder::create_builtins()
                 _mulExtended(glsl_type::uvec3_type),
                 _mulExtended(glsl_type::uvec4_type),
                 NULL);
+
+   add_function("atomicCounter",
+                _atomic_op("__intrinsic_atomic_read",
+                           shader_atomic_counters),
+                NULL);
+   add_function("atomicCounterIncrement",
+                _atomic_op("__intrinsic_atomic_increment",
+                           shader_atomic_counters),
+                NULL);
+   add_function("atomicCounterDecrement",
+                _atomic_op("__intrinsic_atomic_predecrement",
+                           shader_atomic_counters),
+                NULL);
+
 #undef F
 #undef FI
 #undef FIU
@@ -1994,8 +2125,6 @@ builtin_builder::add_function(const char *name, ...)
       if (sig == NULL)
          break;
 
-      sig->is_defined = true;
-
       if (false) {
          exec_list stuff;
          stuff.push_tail(sig);
@@ -2093,7 +2222,13 @@ builtin_builder::new_sig(const glsl_type *return_type,
 #define MAKE_SIG(return_type, avail, ...)  \
    ir_function_signature *sig =               \
       new_sig(return_type, avail, __VA_ARGS__);      \
-   ir_factory body(&sig->body, mem_ctx);
+   ir_factory body(&sig->body, mem_ctx);             \
+   sig->is_defined = true;
+
+#define MAKE_INTRINSIC(return_type, avail, ...)      \
+   ir_function_signature *sig =                      \
+      new_sig(return_type, avail, __VA_ARGS__);      \
+   sig->is_intrinsic = true;
 
 ir_function_signature *
 builtin_builder::unop(builtin_available_predicate avail,
@@ -2185,6 +2320,26 @@ builtin_builder::asin_expr(ir_variable *x)
                                           mul(abs(x), imm(-0.03102955f))))))))));
 }
 
+ir_call *
+builtin_builder::call(ir_function *f, ir_variable *ret, exec_list params)
+{
+   exec_list actual_params;
+
+   foreach_iter(exec_list_iterator, it, params) {
+      ir_variable *var = ((ir_instruction *)it.get())->as_variable();
+      actual_params.push_tail(var_ref(var));
+   }
+
+   ir_function_signature *sig =
+      f->exact_matching_signature(NULL, &actual_params);
+   if (!sig)
+      return NULL;
+
+   ir_dereference_variable *deref =
+      (sig->return_type->is_void() ? NULL : var_ref(ret));
+
+   return new(mem_ctx) ir_call(sig, deref, &actual_params);
+}
 
 ir_function_signature *
 builtin_builder::_asin(const glsl_type *type)
@@ -3347,11 +3502,21 @@ builtin_builder::_texture(ir_texture_opcode opcode,
    if (flags & TEX_PROJECT)
       tex->projector = swizzle(P, coord_type->vector_elements - 1, 1);
 
-   /* The shadow comparitor is normally in the Z component, but a few types
-    * have sufficiently large coordinates that it's in W.
-    */
-   if (sampler_type->sampler_shadow)
-      tex->shadow_comparitor = swizzle(P, MAX2(coord_size, SWIZZLE_Z), 1);
+   if (sampler_type->sampler_shadow) {
+      if (opcode == ir_tg4) {
+         /* gather has refz as a separate parameter, immediately after the
+          * coordinate
+          */
+         ir_variable *refz = in_var(glsl_type::float_type, "refz");
+         sig->parameters.push_tail(refz);
+         tex->shadow_comparitor = var_ref(refz);
+      } else {
+         /* The shadow comparitor is normally in the Z component, but a few types
+          * have sufficiently large coordinates that it's in W.
+          */
+         tex->shadow_comparitor = swizzle(P, MAX2(coord_size, SWIZZLE_Z), 1);
+      }
+   }
 
    if (opcode == ir_txl) {
       ir_variable *lod = in_var(glsl_type::float_type, "lod");
@@ -3367,14 +3532,23 @@ builtin_builder::_texture(ir_texture_opcode opcode,
       tex->lod_info.grad.dPdy = var_ref(dPdy);
    }
 
-   if (flags & TEX_OFFSET) {
+   if (flags & (TEX_OFFSET | TEX_OFFSET_NONCONST)) {
       int offset_size = coord_size - (sampler_type->sampler_array ? 1 : 0);
       ir_variable *offset =
-         new(mem_ctx) ir_variable(glsl_type::ivec(offset_size), "offset", ir_var_const_in);
+         new(mem_ctx) ir_variable(glsl_type::ivec(offset_size), "offset",
+                                  (flags & TEX_OFFSET) ? ir_var_const_in : ir_var_function_in);
       sig->parameters.push_tail(offset);
       tex->offset = var_ref(offset);
    }
 
+   if (flags & TEX_OFFSET_ARRAY) {
+      ir_variable *offsets =
+         new(mem_ctx) ir_variable(glsl_type::get_array_instance(glsl_type::ivec2_type, 4),
+                                  "offsets", ir_var_const_in);
+      sig->parameters.push_tail(offsets);
+      tex->offset = var_ref(offsets);
+   }
+
    if (opcode == ir_tg4) {
       if (flags & TEX_COMPONENT) {
          ir_variable *component =
@@ -3793,6 +3967,29 @@ builtin_builder::_mulExtended(const glsl_type *type)
 
    return sig;
 }
+
+ir_function_signature *
+builtin_builder::_atomic_intrinsic(builtin_available_predicate avail)
+{
+   ir_variable *counter = in_var(glsl_type::atomic_uint_type, "counter");
+   MAKE_INTRINSIC(glsl_type::uint_type, avail, 1, counter);
+   return sig;
+}
+
+ir_function_signature *
+builtin_builder::_atomic_op(const char *intrinsic,
+                            builtin_available_predicate avail)
+{
+   ir_variable *counter = in_var(glsl_type::atomic_uint_type, "atomic_counter");
+   MAKE_SIG(glsl_type::uint_type, avail, 1, counter);
+
+   ir_variable *retval = body.make_temp(glsl_type::uint_type, "atomic_retval");
+   body.emit(call(shader->symbols->get_function(intrinsic), retval,
+                  sig->parameters));
+   body.emit(ret(retval));
+   return sig;
+}
+
 /** @} */
 
 /******************************************************************************/
diff --git a/mesalib/src/glsl/builtin_type_macros.h b/mesalib/src/glsl/builtin_type_macros.h
index fec38da12..263fd83ff 100644
--- a/mesalib/src/glsl/builtin_type_macros.h
+++ b/mesalib/src/glsl/builtin_type_macros.h
@@ -110,6 +110,8 @@ DECL_TYPE(sampler2DRectShadow,    GL_SAMPLER_2D_RECT_SHADOW,        GLSL_SAMPLER
 
 DECL_TYPE(samplerExternalOES,     GL_SAMPLER_EXTERNAL_OES,          GLSL_SAMPLER_DIM_EXTERNAL, 0, 0, GLSL_TYPE_FLOAT)
 
+DECL_TYPE(atomic_uint, GL_UNSIGNED_INT_ATOMIC_COUNTER, GLSL_TYPE_ATOMIC_UINT, 1, 1)
+
 STRUCT_TYPE(gl_DepthRangeParameters)
 STRUCT_TYPE(gl_PointParameters)
 STRUCT_TYPE(gl_MaterialParameters)
diff --git a/mesalib/src/glsl/builtin_types.cpp b/mesalib/src/glsl/builtin_types.cpp
index 1a5e5a190..92e386057 100644
--- a/mesalib/src/glsl/builtin_types.cpp
+++ b/mesalib/src/glsl/builtin_types.cpp
@@ -203,6 +203,8 @@ const static struct builtin_type_versions {
    T(sampler2DRectShadow,             140, 999)
 
    T(struct_gl_DepthRangeParameters,  110, 100)
+
+   T(atomic_uint,                     420, 999)
 };
 
 const glsl_type *const deprecated_types[] = {
@@ -284,5 +286,9 @@ _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state)
    if (state->OES_texture_3D_enable) {
       add_type(symbols, glsl_type::sampler3D_type);
    }
+
+   if (state->ARB_shader_atomic_counters_enable) {
+      add_type(symbols, glsl_type::atomic_uint_type);
+   }
 }
 /** @} */
diff --git a/mesalib/src/glsl/builtin_variables.cpp b/mesalib/src/glsl/builtin_variables.cpp
index 018daf67f..7a3505ace 100644
--- a/mesalib/src/glsl/builtin_variables.cpp
+++ b/mesalib/src/glsl/builtin_variables.cpp
@@ -638,6 +638,21 @@ builtin_variable_generator::generate_constants()
        */
       add_const("gl_MaxTextureCoords", state->Const.MaxTextureCoords);
    }
+
+   if (state->ARB_shader_atomic_counters_enable) {
+      add_const("gl_MaxVertexAtomicCounters",
+                state->Const.MaxVertexAtomicCounters);
+      add_const("gl_MaxGeometryAtomicCounters",
+                state->Const.MaxGeometryAtomicCounters);
+      add_const("gl_MaxFragmentAtomicCounters",
+                state->Const.MaxFragmentAtomicCounters);
+      add_const("gl_MaxCombinedAtomicCounters",
+                state->Const.MaxCombinedAtomicCounters);
+      add_const("gl_MaxAtomicCounterBindings",
+                state->Const.MaxAtomicBufferBindings);
+      add_const("gl_MaxTessControlAtomicCounters", 0);
+      add_const("gl_MaxTessEvaluationAtomicCounters", 0);
+   }
 }
 
 
diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.y b/mesalib/src/glsl/glcpp/glcpp-parse.y
index 02100ab0c..86f3cd5aa 100644
--- a/mesalib/src/glsl/glcpp/glcpp-parse.y
+++ b/mesalib/src/glsl/glcpp/glcpp-parse.y
@@ -1254,6 +1254,9 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
 
 	      if (extensions->ARB_texture_gather)
 	         add_builtin_define(parser, "GL_ARB_texture_gather", 1);
+
+	      if (extensions->ARB_shader_atomic_counters)
+	         add_builtin_define(parser, "GL_ARB_shader_atomic_counters", 1);
 	   }
 	}
 
diff --git a/mesalib/src/glsl/glsl_parser.yy b/mesalib/src/glsl/glsl_parser.yy
index 0a0708e95..14420f8a3 100644
--- a/mesalib/src/glsl/glsl_parser.yy
+++ b/mesalib/src/glsl/glsl_parser.yy
@@ -66,14 +66,8 @@ static bool match_layout_qualifier(const char *s1, const char *s2,
     */
    if (state->es_shader)
       return strcmp(s1, s2);
-   else {
-#if defined(_MSC_VER)
-      /* MSVC doesn't have a strcasecmp() function; instead it has _stricmp. */
-      return _stricmp(s1, s2);
-#else
+   else
       return strcasecmp(s1, s2);
-#endif
-   }
 }
 %}
 
@@ -1308,29 +1302,25 @@ layout_qualifier_id:
    {
       memset(& $$, 0, sizeof($$));
 
-      if (state->has_explicit_attrib_location()) {
-         if (match_layout_qualifier("location", $1, state) == 0) {
-            $$.flags.q.explicit_location = 1;
+      if (match_layout_qualifier("location", $1, state) == 0) {
+         $$.flags.q.explicit_location = 1;
 
-            if ($3 >= 0) {
-               $$.location = $3;
-            } else {
-               _mesa_glsl_error(& @3, state,
-                                "invalid location %d specified", $3);
-               YYERROR;
-            }
+         if ($3 >= 0) {
+            $$.location = $3;
+         } else {
+             _mesa_glsl_error(& @3, state, "invalid location %d specified", $3);
+             YYERROR;
          }
+      }
 
-         if (match_layout_qualifier("index", $1, state) == 0) {
-            $$.flags.q.explicit_index = 1;
+      if (match_layout_qualifier("index", $1, state) == 0) {
+         $$.flags.q.explicit_index = 1;
 
-            if ($3 >= 0) {
-               $$.index = $3;
-            } else {
-               _mesa_glsl_error(& @3, state,
-                                "invalid index %d specified", $3);
-               YYERROR;
-            }
+         if ($3 >= 0) {
+            $$.index = $3;
+         } else {
+            _mesa_glsl_error(& @3, state, "invalid index %d specified", $3);
+            YYERROR;
          }
       }
 
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp
index be17109e1..77e8816c4 100644
--- a/mesalib/src/glsl/glsl_parser_extras.cpp
+++ b/mesalib/src/glsl/glsl_parser_extras.cpp
@@ -118,6 +118,12 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx,
    this->Const.MaxGeometryTotalOutputComponents = ctx->Const.MaxGeometryTotalOutputComponents;
    this->Const.MaxGeometryUniformComponents = ctx->Const.GeometryProgram.MaxUniformComponents;
 
+   this->Const.MaxVertexAtomicCounters = ctx->Const.VertexProgram.MaxAtomicCounters;
+   this->Const.MaxGeometryAtomicCounters = ctx->Const.GeometryProgram.MaxAtomicCounters;
+   this->Const.MaxFragmentAtomicCounters = ctx->Const.FragmentProgram.MaxAtomicCounters;
+   this->Const.MaxCombinedAtomicCounters = ctx->Const.MaxCombinedAtomicCounters;
+   this->Const.MaxAtomicBufferBindings = ctx->Const.MaxAtomicBufferBindings;
+
    this->current_function = NULL;
    this->toplevel_ir = NULL;
    this->found_return = false;
@@ -533,6 +539,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
    EXT(AMD_vertex_shader_layer,        true,  false,     AMD_vertex_shader_layer),
    EXT(EXT_shader_integer_mix,         true,  true,      EXT_shader_integer_mix),
    EXT(ARB_texture_gather,             true,  false,     ARB_texture_gather),
+   EXT(ARB_shader_atomic_counters,     true,  false,     ARB_shader_atomic_counters),
 };
 
 #undef EXT
diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h
index a67438412..f22dac355 100644
--- a/mesalib/src/glsl/glsl_parser_extras.h
+++ b/mesalib/src/glsl/glsl_parser_extras.h
@@ -69,6 +69,10 @@ typedef struct YYLTYPE {
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 
+extern void _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
+			     const char *fmt, ...);
+
+
 struct _mesa_glsl_parse_state {
    _mesa_glsl_parse_state(struct gl_context *_ctx, GLenum target,
 			  void *mem_ctx);
@@ -121,6 +125,22 @@ struct _mesa_glsl_parse_state {
       return check_version(130, 300, locp, "bit-wise operations are forbidden");
    }
 
+   bool check_explicit_attrib_location_allowed(YYLTYPE *locp,
+                                               const ir_variable *var)
+   {
+      if (!this->has_explicit_attrib_location()) {
+         const char *const requirement = this->es_shader
+            ? "GLSL ES 300"
+            : "GL_ARB_explicit_attrib_location extension or GLSL 330";
+
+         _mesa_glsl_error(locp, this, "%s explicit location requires %s",
+                          mode_string(var), requirement);
+         return false;
+      }
+
+      return true;
+   }
+
    bool has_explicit_attrib_location() const
    {
       return ARB_explicit_attrib_location_enable || is_version(330, 300);
@@ -229,6 +249,13 @@ struct _mesa_glsl_parse_state {
       unsigned MaxGeometryOutputVertices;
       unsigned MaxGeometryTotalOutputComponents;
       unsigned MaxGeometryUniformComponents;
+
+      /* ARB_shader_atomic_counters */
+      unsigned MaxVertexAtomicCounters;
+      unsigned MaxGeometryAtomicCounters;
+      unsigned MaxFragmentAtomicCounters;
+      unsigned MaxCombinedAtomicCounters;
+      unsigned MaxAtomicBufferBindings;
    } Const;
 
    /**
@@ -325,6 +352,8 @@ struct _mesa_glsl_parse_state {
    bool ARB_shading_language_420pack_warn;
    bool EXT_shader_integer_mix_enable;
    bool EXT_shader_integer_mix_warn;
+   bool ARB_shader_atomic_counters_enable;
+   bool ARB_shader_atomic_counters_warn;
    /*@}*/
 
    /** Extensions supported by the OpenGL implementation. */
@@ -363,9 +392,6 @@ do {								\
    (Current).source = 0;					\
 } while (0)
 
-extern void _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
-			     const char *fmt, ...);
-
 /**
  * Emit a warning to the shader log
  *
diff --git a/mesalib/src/glsl/glsl_types.cpp b/mesalib/src/glsl/glsl_types.cpp
index bc8d87f5f..f74013096 100644
--- a/mesalib/src/glsl/glsl_types.cpp
+++ b/mesalib/src/glsl/glsl_types.cpp
@@ -168,6 +168,24 @@ glsl_type::contains_integer() const
    }
 }
 
+bool
+glsl_type::contains_opaque() const {
+   switch (base_type) {
+   case GLSL_TYPE_SAMPLER:
+   case GLSL_TYPE_ATOMIC_UINT:
+      return true;
+   case GLSL_TYPE_ARRAY:
+      return element_type()->contains_opaque();
+   case GLSL_TYPE_STRUCT:
+      for (unsigned int i = 0; i < length; i++) {
+         if (fields.structure[i].type->contains_opaque())
+            return true;
+      }
+      return false;
+   default:
+      return false;
+   }
+}
 
 gl_texture_index
 glsl_type::sampler_index() const
@@ -601,6 +619,7 @@ glsl_type::component_slots() const
       return this->length * this->fields.array->component_slots();
 
    case GLSL_TYPE_SAMPLER:
+   case GLSL_TYPE_ATOMIC_UINT:
    case GLSL_TYPE_VOID:
    case GLSL_TYPE_ERROR:
       break;
@@ -889,6 +908,7 @@ glsl_type::count_attribute_slots() const
       return this->length * this->fields.array->count_attribute_slots();
 
    case GLSL_TYPE_SAMPLER:
+   case GLSL_TYPE_ATOMIC_UINT:
    case GLSL_TYPE_VOID:
    case GLSL_TYPE_ERROR:
       break;
diff --git a/mesalib/src/glsl/glsl_types.h b/mesalib/src/glsl/glsl_types.h
index 4b5b6efb3..fdb1f3a6e 100644
--- a/mesalib/src/glsl/glsl_types.h
+++ b/mesalib/src/glsl/glsl_types.h
@@ -53,6 +53,7 @@ enum glsl_base_type {
    GLSL_TYPE_FLOAT,
    GLSL_TYPE_BOOL,
    GLSL_TYPE_SAMPLER,
+   GLSL_TYPE_ATOMIC_UINT,
    GLSL_TYPE_STRUCT,
    GLSL_TYPE_INTERFACE,
    GLSL_TYPE_ARRAY,
@@ -441,6 +442,32 @@ struct glsl_type {
    }
 
    /**
+    * Return the amount of atomic counter storage required for a type.
+    */
+   unsigned atomic_size() const
+   {
+      if (base_type == GLSL_TYPE_ATOMIC_UINT)
+         return ATOMIC_COUNTER_SIZE;
+      else if (is_array())
+         return length * element_type()->atomic_size();
+      else
+         return 0;
+   }
+
+   /**
+    * Return whether a type contains any atomic counters.
+    */
+   bool contains_atomic() const
+   {
+      return atomic_size();
+   }
+
+   /**
+    * Return whether a type contains any opaque types.
+    */
+   bool contains_opaque() const;
+
+   /**
     * Query the full type of a matrix row
     *
     * \return
@@ -468,7 +495,6 @@ struct glsl_type {
 	 : error_type;
    }
 
-
    /**
     * Get the type of a structure field
     *
@@ -478,13 +504,11 @@ struct glsl_type {
     */
    const glsl_type *field_type(const char *name) const;
 
-
    /**
     * Get the location of a filed within a record type
     */
    int field_index(const char *name) const;
 
-
    /**
     * Query the number of elements in an array type
     *
@@ -499,6 +523,14 @@ struct glsl_type {
    }
 
    /**
+    * Query whether the array size for all dimensions has been declared.
+    */
+   bool is_unsized_array() const
+   {
+      return is_array() && length == 0;
+   }
+
+   /**
     * Return the number of coordinate components needed for this sampler type.
     *
     * This is based purely on the sampler's dimensionality.  For example, this
diff --git a/mesalib/src/glsl/hir_field_selection.cpp b/mesalib/src/glsl/hir_field_selection.cpp
index 08be74365..1e92c89ae 100644
--- a/mesalib/src/glsl/hir_field_selection.cpp
+++ b/mesalib/src/glsl/hir_field_selection.cpp
@@ -72,7 +72,7 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr,
             _mesa_glsl_error(&loc, state, "length method takes no arguments");
 
          if (op->type->is_array()) {
-            if (op->type->array_size() == 0)
+            if (op->type->is_unsized_array())
                _mesa_glsl_error(&loc, state, "length called on unsized array");
 
             result = new(ctx) ir_constant(op->type->array_size());
diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp
index c682e3ed5..1b4973612 100644
--- a/mesalib/src/glsl/ir.cpp
+++ b/mesalib/src/glsl/ir.cpp
@@ -1586,7 +1586,7 @@ ir_variable::ir_variable(const struct glsl_type *type, const char *name,
 			 ir_variable_mode mode)
    : max_array_access(0), max_ifc_array_access(NULL),
      read_only(false), centroid(false), invariant(false),
-     mode(mode), interpolation(INTERP_QUALIFIER_NONE)
+        mode(mode), interpolation(INTERP_QUALIFIER_NONE), atomic()
 {
    this->ir_type = ir_type_variable;
    this->type = type;
@@ -1647,8 +1647,8 @@ ir_variable::determine_interpolation_mode(bool flat_shade)
 
 ir_function_signature::ir_function_signature(const glsl_type *return_type,
                                              builtin_available_predicate b)
-   : return_type(return_type), is_defined(false), builtin_avail(b),
-     _function(NULL)
+   : return_type(return_type), is_defined(false), is_intrinsic(false),
+     builtin_avail(b), _function(NULL)
 {
    this->ir_type = ir_type_function_signature;
    this->origin = NULL;
@@ -1891,3 +1891,46 @@ vertices_per_prim(GLenum prim)
       return 3;
    }
 }
+
+/**
+ * Generate a string describing the mode of a variable
+ */
+const char *
+mode_string(const ir_variable *var)
+{
+   switch (var->mode) {
+   case ir_var_auto:
+      return (var->read_only) ? "global constant" : "global variable";
+
+   case ir_var_uniform:
+      return "uniform";
+
+   case ir_var_shader_in:
+      return "shader input";
+
+   case ir_var_shader_out:
+      return "shader output";
+
+   case ir_var_function_in:
+   case ir_var_const_in:
+      return "function input";
+
+   case ir_var_function_out:
+      return "function output";
+
+   case ir_var_function_inout:
+      return "function inout";
+
+   case ir_var_system_value:
+      return "shader input";
+
+   case ir_var_temporary:
+      return "compiler temporary";
+
+   case ir_var_mode_count:
+      break;
+   }
+
+   assert(!"Should not get here.");
+   return "invalid variable";
+}
diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h
index 8d5bec9c1..5b30fe59b 100644
--- a/mesalib/src/glsl/ir.h
+++ b/mesalib/src/glsl/ir.h
@@ -639,6 +639,14 @@ public:
    int binding;
 
    /**
+    * Location an atomic counter is stored at.
+    */
+   struct {
+      unsigned buffer_index;
+      unsigned offset;
+   } atomic;
+
+   /**
     * Built-in state that backs this uniform
     *
     * Once set at variable creation, \c state_slots must remain invariant.
@@ -779,6 +787,12 @@ public:
    /** Whether or not this function signature is a built-in. */
    bool is_builtin() const;
 
+   /**
+    * Whether or not this function is an intrinsic to be implemented
+    * by the driver.
+    */
+   bool is_intrinsic;
+
    /** Whether or not a built-in is available for this shader. */
    bool is_builtin_available(const _mesa_glsl_parse_state *state) const;
 
@@ -2292,6 +2306,9 @@ extern char *
 prototype_string(const glsl_type *return_type, const char *name,
 		 exec_list *parameters);
 
+const char *
+mode_string(const ir_variable *var);
+
 extern "C" {
 #endif /* __cplusplus */
 
diff --git a/mesalib/src/glsl/ir_clone.cpp b/mesalib/src/glsl/ir_clone.cpp
index 105f9063a..b0f173a62 100644
--- a/mesalib/src/glsl/ir_clone.cpp
+++ b/mesalib/src/glsl/ir_clone.cpp
@@ -57,6 +57,8 @@ ir_variable::clone(void *mem_ctx, struct hash_table *ht) const
    var->location = this->location;
    var->index = this->index;
    var->binding = this->binding;
+   var->atomic.buffer_index = this->atomic.buffer_index;
+   var->atomic.offset = this->atomic.offset;
    var->warn_extension = this->warn_extension;
    var->origin_upper_left = this->origin_upper_left;
    var->pixel_center_integer = this->pixel_center_integer;
@@ -395,6 +397,7 @@ ir_constant::clone(void *mem_ctx, struct hash_table *ht) const
    }
 
    case GLSL_TYPE_SAMPLER:
+   case GLSL_TYPE_ATOMIC_UINT:
    case GLSL_TYPE_VOID:
    case GLSL_TYPE_ERROR:
    case GLSL_TYPE_INTERFACE:
diff --git a/mesalib/src/glsl/ir_uniform.h b/mesalib/src/glsl/ir_uniform.h
index 8198c4819..13faab7c0 100644
--- a/mesalib/src/glsl/ir_uniform.h
+++ b/mesalib/src/glsl/ir_uniform.h
@@ -166,6 +166,13 @@ struct gl_uniform_storage {
    bool row_major;
 
    /** @} */
+
+   /**
+    * Index within gl_shader_program::AtomicBuffers[] of the atomic
+    * counter buffer this uniform is stored in, or -1 if this is not
+    * an atomic counter.
+    */
+   int atomic_buffer_index;
 };
 
 #ifdef __cplusplus
diff --git a/mesalib/src/glsl/link_functions.cpp b/mesalib/src/glsl/link_functions.cpp
index fd8009998..68aa62032 100644
--- a/mesalib/src/glsl/link_functions.cpp
+++ b/mesalib/src/glsl/link_functions.cpp
@@ -155,14 +155,17 @@ public:
 
       linked_sig->replace_parameters(&formal_parameters);
 
-      foreach_list_const(node, &sig->body) {
-	 const ir_instruction *const original = (ir_instruction *) node;
+      if (sig->is_defined) {
+         foreach_list_const(node, &sig->body) {
+            const ir_instruction *const original = (ir_instruction *) node;
 
-	 ir_instruction *copy = original->clone(linked, ht);
-	 linked_sig->body.push_tail(copy);
+            ir_instruction *copy = original->clone(linked, ht);
+            linked_sig->body.push_tail(copy);
+         }
+
+         linked_sig->is_defined = true;
       }
 
-      linked_sig->is_defined = true;
       hash_table_dtor(ht);
 
       /* Patch references inside the function to things outside the function
@@ -307,7 +310,8 @@ find_matching_signature(const char *name, const exec_list *actual_parameters,
       ir_function_signature *sig =
          f->matching_signature(NULL, actual_parameters);
 
-      if ((sig == NULL) || !sig->is_defined)
+      if ((sig == NULL) ||
+          (!sig->is_defined && !sig->is_intrinsic))
 	 continue;
 
       /* If this function expects to bind to a built-in function and the
diff --git a/mesalib/src/glsl/link_uniform_initializers.cpp b/mesalib/src/glsl/link_uniform_initializers.cpp
index 3f6671047..786aaf0b4 100644
--- a/mesalib/src/glsl/link_uniform_initializers.cpp
+++ b/mesalib/src/glsl/link_uniform_initializers.cpp
@@ -69,6 +69,7 @@ copy_constant_to_storage(union gl_constant_value *storage,
 	 break;
       case GLSL_TYPE_ARRAY:
       case GLSL_TYPE_STRUCT:
+      case GLSL_TYPE_ATOMIC_UINT:
       case GLSL_TYPE_INTERFACE:
       case GLSL_TYPE_VOID:
       case GLSL_TYPE_ERROR:
diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp
index ea71b3063..0a15739c2 100644
--- a/mesalib/src/glsl/link_uniforms.cpp
+++ b/mesalib/src/glsl/link_uniforms.cpp
@@ -513,6 +513,7 @@ private:
       this->uniforms[id].num_driver_storage = 0;
       this->uniforms[id].driver_storage = NULL;
       this->uniforms[id].storage = this->values;
+      this->uniforms[id].atomic_buffer_index = -1;
       if (this->ubo_block_index != -1) {
 	 this->uniforms[id].block_index = this->ubo_block_index;
 
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index d8f655c39..49bb142a8 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -558,29 +558,6 @@ validate_geometry_shader_executable(struct gl_shader_program *prog,
 
 
 /**
- * Generate a string describing the mode of a variable
- */
-static const char *
-mode_string(const ir_variable *var)
-{
-   switch (var->mode) {
-   case ir_var_auto:
-      return (var->read_only) ? "global constant" : "global variable";
-
-   case ir_var_uniform:    return "uniform";
-   case ir_var_shader_in:  return "shader input";
-   case ir_var_shader_out: return "shader output";
-
-   case ir_var_const_in:
-   case ir_var_temporary:
-   default:
-      assert(!"Should not get here.");
-      return "invalid variable";
-   }
-}
-
-
-/**
  * Perform validation of global variables used across multiple shaders
  */
 void
@@ -1108,7 +1085,7 @@ private:
     */
    static void fixup_type(const glsl_type **type, unsigned max_array_access)
    {
-      if ((*type)->is_array() && (*type)->length == 0) {
+      if ((*type)->is_unsized_array()) {
          *type = glsl_type::get_array_instance((*type)->fields.array,
                                                max_array_access + 1);
          assert(*type != NULL);
@@ -1123,7 +1100,7 @@ private:
    {
       for (unsigned i = 0; i < type->length; i++) {
          const glsl_type *elem_type = type->fields.structure[i].type;
-         if (elem_type->is_array() && elem_type->length == 0)
+         if (elem_type->is_unsized_array())
             return true;
       }
       return false;
diff --git a/mesalib/src/glsl/opt_algebraic.cpp b/mesalib/src/glsl/opt_algebraic.cpp
index 37b2f02c6..a07e153ae 100644
--- a/mesalib/src/glsl/opt_algebraic.cpp
+++ b/mesalib/src/glsl/opt_algebraic.cpp
@@ -32,8 +32,11 @@
 #include "ir_visitor.h"
 #include "ir_rvalue_visitor.h"
 #include "ir_optimization.h"
+#include "ir_builder.h"
 #include "glsl_types.h"
 
+using namespace ir_builder;
+
 namespace {
 
 /**
@@ -194,7 +197,6 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
 {
    ir_constant *op_const[4] = {NULL, NULL, NULL, NULL};
    ir_expression *op_expr[4] = {NULL, NULL, NULL, NULL};
-   ir_expression *temp;
    unsigned int i;
 
    assert(ir->get_num_operands() <= 4);
@@ -217,12 +219,7 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
       switch (op_expr[0]->operation) {
       case ir_unop_abs:
       case ir_unop_neg:
-         this->progress = true;
-         temp = new(mem_ctx) ir_expression(ir_unop_abs,
-                                           ir->type,
-                                           op_expr[0]->operands[0],
-                                           NULL);
-         return swizzle_if_required(ir, temp);
+         return abs(op_expr[0]->operands[0]);
       default:
          break;
       }
@@ -233,8 +230,7 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
 	 break;
 
       if (op_expr[0]->operation == ir_unop_neg) {
-         this->progress = true;
-         return swizzle_if_required(ir, op_expr[0]->operands[0]);
+         return op_expr[0]->operands[0];
       }
       break;
 
@@ -261,7 +257,6 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
       }
 
       if (new_op != ir_unop_logic_not) {
-	 this->progress = true;
 	 return new(mem_ctx) ir_expression(new_op,
 					   ir->type,
 					   op_expr[0]->operands[0],
@@ -272,14 +267,10 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
    }
 
    case ir_binop_add:
-      if (is_vec_zero(op_const[0])) {
-	 this->progress = true;
-	 return swizzle_if_required(ir, ir->operands[1]);
-      }
-      if (is_vec_zero(op_const[1])) {
-	 this->progress = true;
-	 return swizzle_if_required(ir, ir->operands[0]);
-      }
+      if (is_vec_zero(op_const[0]))
+	 return ir->operands[1];
+      if (is_vec_zero(op_const[1]))
+	 return ir->operands[0];
 
       /* Reassociate addition of constants so that we can do constant
        * folding.
@@ -291,50 +282,25 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
       break;
 
    case ir_binop_sub:
-      if (is_vec_zero(op_const[0])) {
-	 this->progress = true;
-	 temp = new(mem_ctx) ir_expression(ir_unop_neg,
-					   ir->operands[1]->type,
-					   ir->operands[1],
-					   NULL);
-	 return swizzle_if_required(ir, temp);
-      }
-      if (is_vec_zero(op_const[1])) {
-	 this->progress = true;
-	 return swizzle_if_required(ir, ir->operands[0]);
-      }
+      if (is_vec_zero(op_const[0]))
+	 return neg(ir->operands[1]);
+      if (is_vec_zero(op_const[1]))
+	 return ir->operands[0];
       break;
 
    case ir_binop_mul:
-      if (is_vec_one(op_const[0])) {
-	 this->progress = true;
-	 return swizzle_if_required(ir, ir->operands[1]);
-      }
-      if (is_vec_one(op_const[1])) {
-	 this->progress = true;
-	 return swizzle_if_required(ir, ir->operands[0]);
-      }
+      if (is_vec_one(op_const[0]))
+	 return ir->operands[1];
+      if (is_vec_one(op_const[1]))
+	 return ir->operands[0];
 
-      if (is_vec_zero(op_const[0]) || is_vec_zero(op_const[1])) {
-	 this->progress = true;
+      if (is_vec_zero(op_const[0]) || is_vec_zero(op_const[1]))
 	 return ir_constant::zero(ir, ir->type);
-      }
-      if (is_vec_negative_one(op_const[0])) {
-         this->progress = true;
-         temp = new(mem_ctx) ir_expression(ir_unop_neg,
-                                           ir->operands[1]->type,
-                                           ir->operands[1],
-                                           NULL);
-         return swizzle_if_required(ir, temp);
-      }
-      if (is_vec_negative_one(op_const[1])) {
-         this->progress = true;
-         temp = new(mem_ctx) ir_expression(ir_unop_neg,
-                                           ir->operands[0]->type,
-                                           ir->operands[0],
-                                           NULL);
-         return swizzle_if_required(ir, temp);
-      }
+
+      if (is_vec_negative_one(op_const[0]))
+         return neg(ir->operands[1]);
+      if (is_vec_negative_one(op_const[1]))
+         return neg(ir->operands[0]);
 
 
       /* Reassociate multiplication of constants so that we can do
@@ -349,26 +315,20 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
 
    case ir_binop_div:
       if (is_vec_one(op_const[0]) && ir->type->base_type == GLSL_TYPE_FLOAT) {
-	 this->progress = true;
-	 temp = new(mem_ctx) ir_expression(ir_unop_rcp,
+	 return new(mem_ctx) ir_expression(ir_unop_rcp,
 					   ir->operands[1]->type,
 					   ir->operands[1],
 					   NULL);
-	 return swizzle_if_required(ir, temp);
-      }
-      if (is_vec_one(op_const[1])) {
-	 this->progress = true;
-	 return swizzle_if_required(ir, ir->operands[0]);
       }
+      if (is_vec_one(op_const[1]))
+	 return ir->operands[0];
       break;
 
    case ir_binop_dot:
-      if (is_vec_zero(op_const[0]) || is_vec_zero(op_const[1])) {
-	 this->progress = true;
+      if (is_vec_zero(op_const[0]) || is_vec_zero(op_const[1]))
 	 return ir_constant::zero(mem_ctx, ir->type);
-      }
+
       if (is_vec_basis(op_const[0])) {
-	 this->progress = true;
 	 unsigned component = 0;
 	 for (unsigned c = 0; c < op_const[0]->type->vector_elements; c++) {
 	    if (op_const[0]->value.f[c] == 1.0)
@@ -377,7 +337,6 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
 	 return new(mem_ctx) ir_swizzle(ir->operands[1], component, 0, 0, 0, 1);
       }
       if (is_vec_basis(op_const[1])) {
-	 this->progress = true;
 	 unsigned component = 0;
 	 for (unsigned c = 0; c < op_const[1]->type->vector_elements; c++) {
 	    if (op_const[1]->value.f[c] == 1.0)
@@ -387,46 +346,52 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
       }
       break;
 
+   case ir_binop_rshift:
+   case ir_binop_lshift:
+      /* 0 >> x == 0 */
+      if (is_vec_zero(op_const[0]))
+         return ir->operands[0];
+      /* x >> 0 == x */
+      if (is_vec_zero(op_const[1]))
+         return ir->operands[0];
+      break;
+
    case ir_binop_logic_and:
       /* FINISHME: Also simplify (a && a) to (a). */
       if (is_vec_one(op_const[0])) {
-	 this->progress = true;
 	 return ir->operands[1];
       } else if (is_vec_one(op_const[1])) {
-	 this->progress = true;
 	 return ir->operands[0];
       } else if (is_vec_zero(op_const[0]) || is_vec_zero(op_const[1])) {
-	 this->progress = true;
 	 return ir_constant::zero(mem_ctx, ir->type);
+      } else if (op_expr[0] && op_expr[0]->operation == ir_unop_logic_not &&
+                 op_expr[1] && op_expr[1]->operation == ir_unop_logic_not) {
+         /* De Morgan's Law:
+          *    (not A) and (not B) === not (A or B)
+          */
+         return logic_not(logic_or(op_expr[0]->operands[0],
+                                   op_expr[1]->operands[0]));
       }
       break;
 
    case ir_binop_logic_xor:
       /* FINISHME: Also simplify (a ^^ a) to (false). */
       if (is_vec_zero(op_const[0])) {
-	 this->progress = true;
 	 return ir->operands[1];
       } else if (is_vec_zero(op_const[1])) {
-	 this->progress = true;
 	 return ir->operands[0];
       } else if (is_vec_one(op_const[0])) {
-	 this->progress = true;
-	 return new(mem_ctx) ir_expression(ir_unop_logic_not, ir->type,
-					   ir->operands[1], NULL);
+	 return logic_not(ir->operands[1]);
       } else if (is_vec_one(op_const[1])) {
-	 this->progress = true;
-	 return new(mem_ctx) ir_expression(ir_unop_logic_not, ir->type,
-					   ir->operands[0], NULL);
+	 return logic_not(ir->operands[0]);
       }
       break;
 
    case ir_binop_logic_or:
       /* FINISHME: Also simplify (a || a) to (a). */
       if (is_vec_zero(op_const[0])) {
-	 this->progress = true;
 	 return ir->operands[1];
       } else if (is_vec_zero(op_const[1])) {
-	 this->progress = true;
 	 return ir->operands[0];
       } else if (is_vec_one(op_const[0]) || is_vec_one(op_const[1])) {
 	 ir_constant_data data;
@@ -434,16 +399,20 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
 	 for (unsigned i = 0; i < 16; i++)
 	    data.b[i] = true;
 
-	 this->progress = true;
 	 return new(mem_ctx) ir_constant(ir->type, &data);
+      } else if (op_expr[0] && op_expr[0]->operation == ir_unop_logic_not &&
+                 op_expr[1] && op_expr[1]->operation == ir_unop_logic_not) {
+         /* De Morgan's Law:
+          *    (not A) or (not B) === not (A and B)
+          */
+         return logic_not(logic_and(op_expr[0]->operands[0],
+                                    op_expr[1]->operands[0]));
       }
       break;
 
    case ir_unop_rcp:
-      if (op_expr[0] && op_expr[0]->operation == ir_unop_rcp) {
-	 this->progress = true;
+      if (op_expr[0] && op_expr[0]->operation == ir_unop_rcp)
 	 return op_expr[0]->operands[0];
-      }
 
       /* FINISHME: We should do rcp(rsq(x)) -> sqrt(x) for some
        * backends, except that some backends will have done sqrt ->
@@ -452,12 +421,7 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
 
       /* As far as we know, all backends are OK with rsq. */
       if (op_expr[0] && op_expr[0]->operation == ir_unop_sqrt) {
-	 this->progress = true;
-	 temp = new(mem_ctx) ir_expression(ir_unop_rsq,
-					   op_expr[0]->operands[0]->type,
-					   op_expr[0]->operands[0],
-					   NULL);
-	 return swizzle_if_required(ir, temp);
+	 return rsq(op_expr[0]->operands[0]);
       }
 
       break;
@@ -465,11 +429,9 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
    case ir_triop_lrp:
       /* Operands are (x, y, a). */
       if (is_vec_zero(op_const[2])) {
-         this->progress = true;
-         return swizzle_if_required(ir, ir->operands[0]);
+         return ir->operands[0];
       } else if (is_vec_one(op_const[2])) {
-         this->progress = true;
-         return swizzle_if_required(ir, ir->operands[1]);
+         return ir->operands[1];
       }
       break;
 
@@ -490,7 +452,17 @@ ir_algebraic_visitor::handle_rvalue(ir_rvalue **rvalue)
    if (!expr || expr->operation == ir_quadop_vector)
       return;
 
-   *rvalue = handle_expression(expr);
+   ir_rvalue *new_rvalue = handle_expression(expr);
+   if (new_rvalue == *rvalue)
+      return;
+
+   /* If the expr used to be some vec OP scalar returning a vector, and the
+    * optimization gave us back a scalar, we still need to turn it into a
+    * vector.
+    */
+   *rvalue = swizzle_if_required(expr, new_rvalue);
+
+   this->progress = true;
 }
 
 bool
diff --git a/mesalib/src/glsl/opt_array_splitting.cpp b/mesalib/src/glsl/opt_array_splitting.cpp
index 34ac836ae..c7c5f6712 100644
--- a/mesalib/src/glsl/opt_array_splitting.cpp
+++ b/mesalib/src/glsl/opt_array_splitting.cpp
@@ -132,7 +132,7 @@ ir_array_reference_visitor::get_variable_entry(ir_variable *var)
    /* If the array hasn't been sized yet, we can't split it.  After
     * linking, this should be resolved.
     */
-   if (var->type->is_array() && var->type->length == 0)
+   if (var->type->is_unsized_array())
       return NULL;
 
    foreach_iter(exec_list_iterator, iter, this->variable_list) {
diff --git a/mesalib/src/glsl/opt_dead_builtin_varyings.cpp b/mesalib/src/glsl/opt_dead_builtin_varyings.cpp
index 7e8cd4372..b336bc0a8 100644
--- a/mesalib/src/glsl/opt_dead_builtin_varyings.cpp
+++ b/mesalib/src/glsl/opt_dead_builtin_varyings.cpp
@@ -42,9 +42,11 @@
  * If any texture coordinate slots can be eliminated, the gl_TexCoord array is
  * broken down into separate vec4 variables with locations equal to
  * VARYING_SLOT_TEX0 + i.
+ *
+ * The same is done for the gl_FragData fragment shader output.
  */
 
-#include "main/imports.h" /* for snprintf */
+#include "main/core.h" /* for snprintf and ARRAY_SIZE */
 #include "ir.h"
 #include "ir_rvalue_visitor.h"
 #include "ir_optimization.h"
@@ -60,10 +62,14 @@ namespace {
 class varying_info_visitor : public ir_hierarchical_visitor {
 public:
    /* "mode" can be either ir_var_shader_in or ir_var_shader_out */
-   varying_info_visitor(ir_variable_mode mode)
+   varying_info_visitor(ir_variable_mode mode, bool find_frag_outputs = false)
       : lower_texcoord_array(true),
         texcoord_array(NULL),
         texcoord_usage(0),
+        find_frag_outputs(find_frag_outputs),
+        lower_fragdata_array(true),
+        fragdata_array(NULL),
+        fragdata_usage(0),
         color_usage(0),
         tfeedback_color_usage(0),
         fog(NULL),
@@ -79,8 +85,27 @@ public:
    {
       ir_variable *var = ir->variable_referenced();
 
-      if (var && var->mode == this->mode &&
-          var->location == VARYING_SLOT_TEX0) {
+      if (!var || var->mode != this->mode)
+         return visit_continue;
+
+      if (this->find_frag_outputs && var->location == FRAG_RESULT_DATA0) {
+         this->fragdata_array = var;
+
+         ir_constant *index = ir->array_index->as_constant();
+         if (index == NULL) {
+            /* This is variable indexing. */
+            this->fragdata_usage |= (1 << var->type->array_size()) - 1;
+            this->lower_fragdata_array = false;
+         }
+         else {
+            this->fragdata_usage |= 1 << index->get_uint_component(0);
+         }
+
+         /* Don't visit the leaves of ir_dereference_array. */
+         return visit_continue_with_parent;
+      }
+
+      if (!this->find_frag_outputs && var->location == VARYING_SLOT_TEX0) {
          this->texcoord_array = var;
 
          ir_constant *index = ir->array_index->as_constant();
@@ -105,8 +130,17 @@ public:
    {
       ir_variable *var = ir->variable_referenced();
 
-      if (var->mode == this->mode && var->type->is_array() &&
-          var->location == VARYING_SLOT_TEX0) {
+      if (var->mode != this->mode || !var->type->is_array())
+         return visit_continue;
+
+      if (this->find_frag_outputs && var->location == FRAG_RESULT_DATA0) {
+         /* This is a whole array dereference. */
+         this->fragdata_usage |= (1 << var->type->array_size()) - 1;
+         this->lower_fragdata_array = false;
+         return visit_continue;
+      }
+
+      if (!this->find_frag_outputs && var->location == VARYING_SLOT_TEX0) {
          /* This is a whole array dereference like "gl_TexCoord = x;",
           * there's probably no point in lowering that.
           */
@@ -121,6 +155,10 @@ public:
       if (var->mode != this->mode)
          return visit_continue;
 
+      /* Nothing to do here for fragment outputs. */
+      if (this->find_frag_outputs)
+         return visit_continue;
+
       /* Handle colors and fog. */
       switch (var->location) {
       case VARYING_SLOT_COL0:
@@ -185,12 +223,20 @@ public:
       if (!this->texcoord_array) {
          this->lower_texcoord_array = false;
       }
+      if (!this->fragdata_array) {
+         this->lower_fragdata_array = false;
+      }
    }
 
    bool lower_texcoord_array;
    ir_variable *texcoord_array;
    unsigned texcoord_usage; /* bitmask */
 
+   bool find_frag_outputs; /* false if it's looking for varyings */
+   bool lower_fragdata_array;
+   ir_variable *fragdata_array;
+   unsigned fragdata_usage; /* bitmask */
+
    ir_variable *color[2];
    ir_variable *backcolor[2];
    unsigned color_usage; /* bitmask */
@@ -222,6 +268,7 @@ public:
    {
       void *const ctx = ir;
 
+      memset(this->new_fragdata, 0, sizeof(this->new_fragdata));
       memset(this->new_texcoord, 0, sizeof(this->new_texcoord));
       memset(this->new_color, 0, sizeof(this->new_color));
       memset(this->new_backcolor, 0, sizeof(this->new_backcolor));
@@ -236,31 +283,16 @@ public:
        * occurences of gl_TexCoord will be replaced with.
        */
       if (info->lower_texcoord_array) {
-         for (int i = MAX_TEXTURE_COORD_UNITS-1; i >= 0; i--) {
-            if (info->texcoord_usage & (1 << i)) {
-               char name[32];
-
-               if (!(external_texcoord_usage & (1 << i))) {
-                  /* This varying is unused in the next stage. Declare
-                   * a temporary instead of an output. */
-                  snprintf(name, 32, "gl_%s_TexCoord%i_dummy", mode_str, i);
-                  this->new_texcoord[i] =
-                     new (ctx) ir_variable(glsl_type::vec4_type, name,
-                                           ir_var_temporary);
-               }
-               else {
-                  snprintf(name, 32, "gl_%s_TexCoord%i", mode_str, i);
-                  this->new_texcoord[i] =
-                     new(ctx) ir_variable(glsl_type::vec4_type, name,
-                                          info->mode);
-                  this->new_texcoord[i]->location = VARYING_SLOT_TEX0 + i;
-                  this->new_texcoord[i]->explicit_location = true;
-                  this->new_texcoord[i]->explicit_index = 0;
-               }
-
-               ir->head->insert_before(new_texcoord[i]);
-            }
-         }
+         prepare_array(ir, this->new_texcoord, ARRAY_SIZE(this->new_texcoord),
+                       VARYING_SLOT_TEX0, "TexCoord", mode_str,
+                       info->texcoord_usage, external_texcoord_usage);
+      }
+
+      /* Handle gl_FragData in the same way like gl_TexCoord. */
+      if (info->lower_fragdata_array) {
+         prepare_array(ir, this->new_fragdata, ARRAY_SIZE(this->new_fragdata),
+                       FRAG_RESULT_DATA0, "FragData", mode_str,
+                       info->fragdata_usage, (1 << MAX_DRAW_BUFFERS) - 1);
       }
 
       /* Create dummy variables which will replace set-but-unused color and
@@ -301,6 +333,41 @@ public:
       visit_list_elements(this, ir);
    }
 
+   void prepare_array(exec_list *ir,
+                      struct ir_variable **new_var,
+                      int max_elements, unsigned start_location,
+                      const char *var_name, const char *mode_str,
+                      unsigned usage, unsigned external_usage)
+   {
+      void *const ctx = ir;
+
+      for (int i = max_elements-1; i >= 0; i--) {
+         if (usage & (1 << i)) {
+            char name[32];
+
+            if (!(external_usage & (1 << i))) {
+               /* This varying is unused in the next stage. Declare
+                * a temporary instead of an output. */
+               snprintf(name, 32, "gl_%s_%s%i_dummy", mode_str, var_name, i);
+               new_var[i] =
+                  new (ctx) ir_variable(glsl_type::vec4_type, name,
+                                        ir_var_temporary);
+            }
+            else {
+               snprintf(name, 32, "gl_%s_%s%i", mode_str, var_name, i);
+               new_var[i] =
+                  new(ctx) ir_variable(glsl_type::vec4_type, name,
+                                       this->info->mode);
+               new_var[i]->location = start_location + i;
+               new_var[i]->explicit_location = true;
+               new_var[i]->explicit_index = 0;
+            }
+
+            ir->head->insert_before(new_var[i]);
+         }
+      }
+   }
+
    virtual ir_visitor_status visit(ir_variable *var)
    {
       /* Remove the gl_TexCoord array. */
@@ -309,6 +376,12 @@ public:
          var->remove();
       }
 
+      /* Remove the gl_FragData array. */
+      if (this->info->lower_fragdata_array &&
+          var == this->info->fragdata_array) {
+         var->remove();
+      }
+
       /* Replace set-but-unused color and fog outputs with dummy variables. */
       for (int i = 0; i < 2; i++) {
          if (var == this->info->color[i] && this->new_color[i]) {
@@ -350,6 +423,19 @@ public:
          }
       }
 
+      /* Same for gl_FragData. */
+      if (this->info->lower_fragdata_array) {
+         /* gl_FragData[i] occurence */
+         ir_dereference_array *const da = (*rvalue)->as_dereference_array();
+
+         if (da && da->variable_referenced() == this->info->fragdata_array) {
+            unsigned i = da->array_index->as_constant()->get_uint_component(0);
+
+            *rvalue = new(ctx) ir_dereference_variable(this->new_fragdata[i]);
+            return;
+         }
+      }
+
       /* Replace set-but-unused color and fog outputs with dummy variables. */
       ir_dereference_variable *const dv = (*rvalue)->as_dereference_variable();
       if (!dv)
@@ -392,6 +478,7 @@ public:
 
 private:
    const varying_info_visitor *info;
+   ir_variable *new_fragdata[MAX_DRAW_BUFFERS];
    ir_variable *new_texcoord[MAX_TEXTURE_COORD_UNITS];
    ir_variable *new_color[2];
    ir_variable *new_backcolor[2];
@@ -408,6 +495,15 @@ lower_texcoord_array(exec_list *ir, const varying_info_visitor *info)
                             1 | 2, true);
 }
 
+static void
+lower_fragdata_array(exec_list *ir)
+{
+   varying_info_visitor info(ir_var_shader_out, true);
+   info.get(ir, 0, NULL);
+
+   replace_varyings_visitor(ir, &info, 0, 0, 0);
+}
+
 
 void
 do_dead_builtin_varyings(struct gl_context *ctx,
@@ -415,8 +511,13 @@ do_dead_builtin_varyings(struct gl_context *ctx,
                          unsigned num_tfeedback_decls,
                          tfeedback_decl *tfeedback_decls)
 {
-   /* This optimization has no effect with the core context and GLES2, because
-    * the built-in varyings we're eliminating here are not available there.
+   /* Lower the gl_FragData array to separate variables. */
+   if (consumer && consumer->Type == GL_FRAGMENT_SHADER) {
+      lower_fragdata_array(consumer->ir);
+   }
+
+   /* Lowering of built-in varyings has no effect with the core context and
+    * GLES2, because they are not available there.
     *
     * EXT_separate_shader_objects doesn't allow this optimization,
     * because a program object can be bound partially (e.g. only one
diff --git a/mesalib/src/glsl/opt_function_inlining.cpp b/mesalib/src/glsl/opt_function_inlining.cpp
index 0733d5180..f8033a095 100644
--- a/mesalib/src/glsl/opt_function_inlining.cpp
+++ b/mesalib/src/glsl/opt_function_inlining.cpp
@@ -35,9 +35,9 @@
 #include "program/hash_table.h"
 
 static void
-do_sampler_replacement(exec_list *instructions,
-		       ir_variable *sampler,
-		       ir_dereference *deref);
+do_variable_replacement(exec_list *instructions,
+                        ir_variable *orig,
+                        ir_dereference *repl);
 
 namespace {
 
@@ -123,11 +123,11 @@ ir_call::generate_inline(ir_instruction *next_ir)
       ir_rvalue *param = (ir_rvalue *) param_iter.get();
 
       /* Generate a new variable for the parameter. */
-      if (sig_param->type->base_type == GLSL_TYPE_SAMPLER) {
-	 /* For samplers, we want the inlined sampler references
-	  * referencing the passed in sampler variable, since that
-	  * will have the location information, which an assignment of
-	  * a sampler wouldn't.  Fix it up below.
+      if (sig_param->type->contains_opaque()) {
+	 /* For opaque types, we want the inlined variable references
+	  * referencing the passed in variable, since that will have
+	  * the location information, which an assignment of an opaque
+	  * variable wouldn't.  Fix it up below.
 	  */
 	 parameters[i] = NULL;
       } else {
@@ -169,8 +169,8 @@ ir_call::generate_inline(ir_instruction *next_ir)
       visit_tree(new_ir, replace_return_with_assignment, this->return_deref);
    }
 
-   /* If any samplers were passed in, replace any deref of the sampler
-    * with a deref of the sampler argument.
+   /* If any opaque types were passed in, replace any deref of the
+    * opaque variable with a deref of the argument.
     */
    param_iter = this->actual_parameters.iterator();
    sig_param_iter = this->callee->parameters.iterator();
@@ -178,11 +178,11 @@ ir_call::generate_inline(ir_instruction *next_ir)
       ir_instruction *const param = (ir_instruction *) param_iter.get();
       ir_variable *sig_param = (ir_variable *) sig_param_iter.get();
 
-      if (sig_param->type->base_type == GLSL_TYPE_SAMPLER) {
+      if (sig_param->type->contains_opaque()) {
 	 ir_dereference *deref = param->as_dereference();
 
 	 assert(deref);
-	 do_sampler_replacement(&new_instructions, sig_param, deref);
+	 do_variable_replacement(&new_instructions, sig_param, deref);
       }
       param_iter.next();
       sig_param_iter.next();
@@ -268,23 +268,23 @@ ir_function_inlining_visitor::visit_enter(ir_call *ir)
 
 
 /**
- * Replaces references to the "sampler" variable with a clone of "deref."
+ * Replaces references to the "orig" variable with a clone of "repl."
  *
- * From the spec, samplers can appear in the tree as function
+ * From the spec, opaque types can appear in the tree as function
  * (non-out) parameters and as the result of array indexing and
  * structure field selection.  In our builtin implementation, they
  * also appear in the sampler field of an ir_tex instruction.
  */
 
-class ir_sampler_replacement_visitor : public ir_hierarchical_visitor {
+class ir_variable_replacement_visitor : public ir_hierarchical_visitor {
 public:
-   ir_sampler_replacement_visitor(ir_variable *sampler, ir_dereference *deref)
+   ir_variable_replacement_visitor(ir_variable *orig, ir_dereference *repl)
    {
-      this->sampler = sampler;
-      this->deref = deref;
+      this->orig = orig;
+      this->repl = repl;
    }
 
-   virtual ~ir_sampler_replacement_visitor()
+   virtual ~ir_variable_replacement_visitor()
    {
    }
 
@@ -296,21 +296,21 @@ public:
    void replace_deref(ir_dereference **deref);
    void replace_rvalue(ir_rvalue **rvalue);
 
-   ir_variable *sampler;
-   ir_dereference *deref;
+   ir_variable *orig;
+   ir_dereference *repl;
 };
 
 void
-ir_sampler_replacement_visitor::replace_deref(ir_dereference **deref)
+ir_variable_replacement_visitor::replace_deref(ir_dereference **deref)
 {
    ir_dereference_variable *deref_var = (*deref)->as_dereference_variable();
-   if (deref_var && deref_var->var == this->sampler) {
-      *deref = this->deref->clone(ralloc_parent(*deref), NULL);
+   if (deref_var && deref_var->var == this->orig) {
+      *deref = this->repl->clone(ralloc_parent(*deref), NULL);
    }
 }
 
 void
-ir_sampler_replacement_visitor::replace_rvalue(ir_rvalue **rvalue)
+ir_variable_replacement_visitor::replace_rvalue(ir_rvalue **rvalue)
 {
    if (!*rvalue)
       return;
@@ -325,7 +325,7 @@ ir_sampler_replacement_visitor::replace_rvalue(ir_rvalue **rvalue)
 }
 
 ir_visitor_status
-ir_sampler_replacement_visitor::visit_leave(ir_texture *ir)
+ir_variable_replacement_visitor::visit_leave(ir_texture *ir)
 {
    replace_deref(&ir->sampler);
 
@@ -333,21 +333,21 @@ ir_sampler_replacement_visitor::visit_leave(ir_texture *ir)
 }
 
 ir_visitor_status
-ir_sampler_replacement_visitor::visit_leave(ir_dereference_array *ir)
+ir_variable_replacement_visitor::visit_leave(ir_dereference_array *ir)
 {
    replace_rvalue(&ir->array);
    return visit_continue;
 }
 
 ir_visitor_status
-ir_sampler_replacement_visitor::visit_leave(ir_dereference_record *ir)
+ir_variable_replacement_visitor::visit_leave(ir_dereference_record *ir)
 {
    replace_rvalue(&ir->record);
    return visit_continue;
 }
 
 ir_visitor_status
-ir_sampler_replacement_visitor::visit_leave(ir_call *ir)
+ir_variable_replacement_visitor::visit_leave(ir_call *ir)
 {
    foreach_iter(exec_list_iterator, iter, *ir) {
       ir_rvalue *param = (ir_rvalue *)iter.get();
@@ -362,11 +362,11 @@ ir_sampler_replacement_visitor::visit_leave(ir_call *ir)
 }
 
 static void
-do_sampler_replacement(exec_list *instructions,
-		       ir_variable *sampler,
-		       ir_dereference *deref)
+do_variable_replacement(exec_list *instructions,
+                        ir_variable *orig,
+                        ir_dereference *repl)
 {
-   ir_sampler_replacement_visitor v(sampler, deref);
+   ir_variable_replacement_visitor v(orig, repl);
 
    visit_list_elements(&v, instructions);
 }
diff --git a/mesalib/src/glsl/ralloc.h b/mesalib/src/glsl/ralloc.h
index 31682d515..4581a7a4e 100644
--- a/mesalib/src/glsl/ralloc.h
+++ b/mesalib/src/glsl/ralloc.h
@@ -415,15 +415,29 @@ bool ralloc_vasprintf_append(char **str, const char *fmt, va_list args);
  * which is more idiomatic in C++ than calling ralloc.
  */
 #define DECLARE_RALLOC_CXX_OPERATORS(TYPE)                               \
+private:                                                                 \
+   static void _ralloc_destructor(void *p)                               \
+   {                                                                     \
+      reinterpret_cast<TYPE *>(p)->~TYPE();                              \
+   }                                                                     \
+public:                                                                  \
    static void* operator new(size_t size, void *mem_ctx)                 \
    {                                                                     \
       void *p = ralloc_size(mem_ctx, size);                              \
       assert(p != NULL);                                                 \
+      if (!HAS_TRIVIAL_DESTRUCTOR(TYPE))                                 \
+         ralloc_set_destructor(p, _ralloc_destructor);                   \
       return p;                                                          \
    }                                                                     \
                                                                          \
    static void operator delete(void *p)                                  \
    {                                                                     \
+      /* The object's destructor is guaranteed to have already been      \
+       * called by the delete operator at this point -- Make sure it's   \
+       * not called again.                                               \
+       */                                                                \
+      if (!HAS_TRIVIAL_DESTRUCTOR(TYPE))                                 \
+         ralloc_set_destructor(p, NULL);                                 \
       ralloc_free(p);                                                    \
    }
 
diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript
index c4ac080aa..152818d22 100644
--- a/mesalib/src/mapi/glapi/SConscript
+++ b/mesalib/src/mapi/glapi/SConscript
@@ -52,6 +52,7 @@ for s in mapi_sources:
 if (env['gcc'] or env['clang']) and \
    env['platform'] not in ('cygwin', 'darwin', 'windows'):
     GLAPI = '#src/mapi/glapi/'
+    sources = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml')
 
     if env['machine'] == 'x86':
         env.Append(CPPDEFINES = [
@@ -63,7 +64,7 @@ if (env['gcc'] or env['clang']) and \
         env.CodeGenerate(
             target = 'glapi_x86.S',
             script = GLAPI + 'gen/gl_x86_asm.py',
-            source = GLAPI + 'gen/gl_and_es_API.xml',
+            source = sources,
             command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
             )
     elif env['machine'] == 'x86_64':
@@ -76,7 +77,7 @@ if (env['gcc'] or env['clang']) and \
         env.CodeGenerate(
             target = 'glapi_x86-64.S',
             script = GLAPI + 'gen/gl_x86-64_asm.py',
-            source = GLAPI + 'gen/gl_and_es_API.xml',
+            source = sources,
             command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
             )
     elif env['machine'] == 'sparc':
@@ -89,7 +90,7 @@ if (env['gcc'] or env['clang']) and \
         env.CodeGenerate(
             target = 'glapi_sparc.S',
             script = GLAPI + 'gen/gl_SPARC_asm.py',
-            source = GLAPI + 'gen/gl_and_es_API.xml',
+            source = sources,
             command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
             )
     else:
diff --git a/mesalib/src/mapi/glapi/gen/ARB_shader_atomic_counters.xml b/mesalib/src/mapi/glapi/gen/ARB_shader_atomic_counters.xml
new file mode 100644
index 000000000..f3b74e9c2
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_shader_atomic_counters.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_shader_atomic_counters" number="114">
+
+<enum name="ATOMIC_COUNTER_BUFFER" value="0x92C0"/>
+<enum name="ATOMIC_COUNTER_BUFFER_BINDING" value="0x92C1"/>
+<enum name="ATOMIC_COUNTER_BUFFER_START" value="0x92C2"/>
+<enum name="ATOMIC_COUNTER_BUFFER_SIZE" value="0x92C3"/>
+<enum name="ATOMIC_COUNTER_BUFFER_DATA_SIZE" value="0x92C4"/>
+<enum name="ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS" value="0x92C5"/>
+<enum name="ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES" value="0x92C6"/>
+<enum name="ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER" value="0x92C7"/>
+<enum name="ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER" value="0x92C8"/>
+<enum name="ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER" value="0x92C9"/>
+<enum name="ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER" value="0x92CA"/>
+<enum name="ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER" value="0x92CB"/>
+<enum name="MAX_VERTEX_ATOMIC_COUNTER_BUFFERS" value="0x92CC"/>
+<enum name="MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS" value="0x92CD"/>
+<enum name="MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS" value="0x92CE"/>
+<enum name="MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS" value="0x92CF"/>
+<enum name="MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS" value="0x92D0"/>
+<enum name="MAX_COMBINED_ATOMIC_COUNTER_BUFFERS" value="0x92D1"/>
+<enum name="MAX_VERTEX_ATOMIC_COUNTERS" value="0x92D2"/>
+<enum name="MAX_TESS_CONTROL_ATOMIC_COUNTERS" value="0x92D3"/>
+<enum name="MAX_TESS_EVALUATION_ATOMIC_COUNTERS" value="0x92D4"/>
+<enum name="MAX_GEOMETRY_ATOMIC_COUNTERS" value="0x92D5"/>
+<enum name="MAX_FRAGMENT_ATOMIC_COUNTERS" value="0x92D6"/>
+<enum name="MAX_COMBINED_ATOMIC_COUNTERS" value="0x92D7"/>
+<enum name="MAX_ATOMIC_COUNTER_BUFFER_SIZE" value="0x92D8"/>
+<enum name="ACTIVE_ATOMIC_COUNTER_BUFFERS" value="0x92D9"/>
+<enum name="UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX" value="0x92DA"/>
+<enum name="UNSIGNED_INT_ATOMIC_COUNTER" value="0x92DB"/>
+<enum name="MAX_ATOMIC_COUNTER_BUFFER_BINDINGS" value="0x92DC"/>
+
+<function name="GetActiveAtomicCounterBufferiv" offset="assign">
+    <param name="program" type="GLuint" />
+    <param name="bufferIndex" type="GLuint" />
+    <param name="pname" type="GLenum" />
+    <param name="params" type="GLint *" />
+</function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index d71d5d2a8..390245216 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -110,6 +110,7 @@ API_XML = \
 	ARB_robustness.xml \
 	ARB_sampler_objects.xml \
 	ARB_seamless_cube_map.xml \
+	ARB_shader_atomic_counters.xml \
 	ARB_sync.xml \
 	ARB_texture_buffer_object.xml \
 	ARB_texture_buffer_range.xml \
@@ -141,6 +142,7 @@ API_XML = \
 	NV_conditional_render.xml \
 	NV_primitive_restart.xml \
 	NV_texture_barrier.xml \
+	NV_vdpau_interop.xml \
 	OES_EGL_image.xml \
 	GL3x.xml
 
diff --git a/mesalib/src/mapi/glapi/gen/NV_vdpau_interop.xml b/mesalib/src/mapi/glapi/gen/NV_vdpau_interop.xml
new file mode 100644
index 000000000..cf5f0eddd
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/NV_vdpau_interop.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_NV_vdpau_interop" number="396">
+
+    <function name="VDPAUInitNV" offset="assign">
+	<param name="vdpDevice" type="const GLvoid *"/>
+	<param name="getProcAddress" type="const GLvoid *"/>
+    </function>
+
+    <function name="VDPAUFiniNV" offset="assign"/>
+
+    <function name="VDPAURegisterVideoSurfaceNV" offset="assign">
+        <return type="GLintptr"/>
+	<param name="vdpSurface" type="const GLvoid *"/>
+	<param name="target" type="GLenum"/>
+	<param name="numTextureNames" type="GLsizei"/>
+	<param name="textureNames" type="const GLuint *"/>
+    </function>
+
+    <function name="VDPAURegisterOutputSurfaceNV" offset="assign">
+        <return type="GLintptr"/>
+	<param name="vdpSurface" type="const GLvoid *"/>
+	<param name="target" type="GLenum"/>
+	<param name="numTextureNames" type="GLsizei"/>
+	<param name="textureNames" type="const GLuint *"/>
+    </function>
+
+    <function name="VDPAUIsSurfaceNV" offset="assign">
+	<param name="surface" type="GLintptr"/>
+    </function>
+
+    <function name="VDPAUUnregisterSurfaceNV" offset="assign">
+	<param name="surface" type="GLintptr"/>
+    </function>
+
+    <function name="VDPAUGetSurfaceivNV" offset="assign">
+	<param name="surface" type="GLintptr"/>
+	<param name="pname" type="GLenum"/>
+	<param name="bufSize" type="GLsizei"/>
+	<param name="length" type="GLsizei *"/>
+	<param name="values" type="GLint *"/>
+    </function>
+
+    <function name="VDPAUSurfaceAccessNV" offset="assign">
+	<param name="surface" type="GLintptr"/>
+	<param name="access" type="GLenum"/>
+    </function>
+
+    <function name="VDPAUMapSurfacesNV" offset="assign">
+	<param name="numSurfaces" type="GLsizei"/>
+	<param name="surfaces" type="const GLintptr *"/>
+    </function>
+
+    <function name="VDPAUUnmapSurfacesNV" offset="assign">
+	<param name="numSurfaces" type="GLsizei"/>
+	<param name="surfaces" type="const GLintptr *"/>
+    </function>
+
+    <enum name="SURFACE_STATE_NV"      value="0x86EB"/>
+    <enum name="SURFACE_REGISTERED_NV" value="0x86FD"/>
+    <enum name="SURFACE_MAPPED_NV"     value="0x8700"/>
+    <enum name="WRITE_DISCARD_NV"      value="0x88BE"/>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 30ab9c9c1..45d69b40a 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8308,6 +8308,8 @@
   <enum name="MIN_MAP_BUFFER_ALIGNMENT" value="0x90BC" />
 </category>
 
+<xi:include href="ARB_shader_atomic_counters.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!-- ARB extension #118 -->
@@ -13118,4 +13120,6 @@
 
 <xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="NV_vdpau_interop.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 </OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/gl_genexec.py b/mesalib/src/mapi/glapi/gen/gl_genexec.py
index a074c2348..3ce190fe3 100644
--- a/mesalib/src/mapi/glapi/gen/gl_genexec.py
+++ b/mesalib/src/mapi/glapi/gen/gl_genexec.py
@@ -111,6 +111,7 @@ header = """/**
 #include "main/syncobj.h"
 #include "main/formatquery.h"
 #include "main/dispatch.h"
+#include "main/vdpau.h"
 #include "vbo/vbo.h"
 
 
diff --git a/mesalib/src/mesa/Makefile.sources b/mesalib/src/mesa/Makefile.sources
index ff242b4ab..a84f8a788 100644
--- a/mesalib/src/mesa/Makefile.sources
+++ b/mesalib/src/mesa/Makefile.sources
@@ -108,6 +108,7 @@ MAIN_FILES = \
 	$(SRCDIR)main/uniforms.c \
 	$(SRCDIR)main/uniform_query.cpp \
 	$(SRCDIR)main/varray.c \
+	$(SRCDIR)main/vdpau.c \
 	$(SRCDIR)main/version.c \
 	$(SRCDIR)main/viewport.c \
 	$(SRCDIR)main/vtxfmt.c \
@@ -248,7 +249,8 @@ STATETRACKER_FILES = \
 	$(SRCDIR)state_tracker/st_manager.c \
 	$(SRCDIR)state_tracker/st_mesa_to_tgsi.c \
 	$(SRCDIR)state_tracker/st_program.c \
-	$(SRCDIR)state_tracker/st_texture.c
+	$(SRCDIR)state_tracker/st_texture.c \
+	$(SRCDIR)state_tracker/st_vdpau.c
 
 PROGRAM_FILES = \
 	$(SRCDIR)program/arbprogparse.c \
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index 9b7712faf..42134983c 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -140,6 +140,7 @@ main_sources = [
     'main/uniform_query.cpp',
     'main/uniforms.c',
     'main/varray.c',
+    'main/vdpau.c',
     'main/version.c',
     'main/viewport.c',
     'main/vtxfmt.c',
@@ -287,6 +288,7 @@ statetracker_sources = [
     'state_tracker/st_mesa_to_tgsi.c',
     'state_tracker/st_program.c',
     'state_tracker/st_texture.c',
+    'state_tracker/st_vdpau.c',
 ]
 
 env.Append(YACCFLAGS = '-d -p "_mesa_program_"')
diff --git a/mesalib/src/mesa/drivers/dri/common/Makefile.am b/mesalib/src/mesa/drivers/dri/common/Makefile.am
index 9f49ff3ae..7f87ed6f5 100644
--- a/mesalib/src/mesa/drivers/dri/common/Makefile.am
+++ b/mesalib/src/mesa/drivers/dri/common/Makefile.am
@@ -27,6 +27,7 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mesa/ \
 	$(DEFINES) \
+	$(EXPAT_CFLAGS) \
 	$(VISIBILITY_CFLAGS)
 
 noinst_LTLIBRARIES = \
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index 312ffb788..1f5506157 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -102,6 +102,11 @@ get_buffer_target(struct gl_context *ctx, GLenum target)
          return &ctx->UniformBuffer;
       }
       break;
+   case GL_ATOMIC_COUNTER_BUFFER:
+      if (ctx->Extensions.ARB_shader_atomic_counters) {
+         return &ctx->AtomicBuffer;
+      }
+      break;
    default:
       return NULL;
    }
@@ -2119,6 +2124,51 @@ bind_buffer_base_uniform_buffer(struct gl_context *ctx,
       set_ubo_binding(ctx, index, bufObj, 0, 0, GL_TRUE);
 }
 
+static void
+set_atomic_buffer_binding(struct gl_context *ctx,
+                          unsigned index,
+                          struct gl_buffer_object *bufObj,
+                          GLintptr offset,
+                          GLsizeiptr size,
+                          const char *name)
+{
+   struct gl_atomic_buffer_binding *binding;
+
+   if (index >= ctx->Const.MaxAtomicBufferBindings) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(index=%d)", name, index);
+      return;
+   }
+
+   if (offset & (ATOMIC_COUNTER_SIZE - 1)) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "%s(offset misalgned %d/%d)", name, (int) offset,
+                  ATOMIC_COUNTER_SIZE);
+      return;
+   }
+
+   _mesa_reference_buffer_object(ctx, &ctx->AtomicBuffer, bufObj);
+
+   binding = &ctx->AtomicBufferBindings[index];
+   if (binding->BufferObject == bufObj &&
+       binding->Offset == offset &&
+       binding->Size == size) {
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, 0);
+   ctx->NewDriverState |= ctx->DriverFlags.NewAtomicBuffer;
+
+   _mesa_reference_buffer_object(ctx, &binding->BufferObject, bufObj);
+
+   if (bufObj == ctx->Shared->NullBufferObj) {
+      binding->Offset = -1;
+      binding->Size = -1;
+   } else {
+      binding->Offset = offset;
+      binding->Size = size;
+   }
+}
+
 void GLAPIENTRY
 _mesa_BindBufferRange(GLenum target, GLuint index,
                       GLuint buffer, GLintptr offset, GLsizeiptr size)
@@ -2156,6 +2206,10 @@ _mesa_BindBufferRange(GLenum target, GLuint index,
    case GL_UNIFORM_BUFFER:
       bind_buffer_range_uniform_buffer(ctx, index, bufObj, offset, size);
       return;
+   case GL_ATOMIC_COUNTER_BUFFER:
+      set_atomic_buffer_binding(ctx, index, bufObj, offset, size,
+                                "glBindBufferRange");
+      return;
    default:
       _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferRange(target)");
       return;
@@ -2215,6 +2269,10 @@ _mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer)
    case GL_UNIFORM_BUFFER:
       bind_buffer_base_uniform_buffer(ctx, index, bufObj);
       return;
+   case GL_ATOMIC_COUNTER_BUFFER:
+      set_atomic_buffer_binding(ctx, index, bufObj, 0, 0,
+                                "glBindBufferBase");
+      return;
    default:
       _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferBase(target)");
       return;
diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h
index 0f27d5a66..d806d5b9d 100644
--- a/mesalib/src/mesa/main/compiler.h
+++ b/mesalib/src/mesa/main/compiler.h
@@ -444,7 +444,29 @@ do {                                                                    \
 #define Elements(x) (sizeof(x)/sizeof(*(x)))
 #endif
 
-
+#ifdef __cplusplus
+/**
+ * Macro function that evaluates to true if T is a trivially
+ * destructible type -- that is, if its (non-virtual) destructor
+ * performs no action and all member variables and base classes are
+ * trivially destructible themselves.
+ */
+#   if defined(__GNUC__)
+#      if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
+#         define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T)
+#      endif
+#   elif (defined(__clang__) && defined(__has_feature))
+#      if __has_feature(has_trivial_destructor)
+#         define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T)
+#      endif
+#   endif
+#   ifndef HAS_TRIVIAL_DESTRUCTOR
+       /* It's always safe (if inefficient) to assume that a
+        * destructor is non-trivial.
+        */
+#      define HAS_TRIVIAL_DESTRUCTOR(T) (false)
+#   endif
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/mesalib/src/mesa/main/config.h b/mesalib/src/mesa/main/config.h
index 0bcf27c34..22bbfa0cf 100644
--- a/mesalib/src/mesa/main/config.h
+++ b/mesalib/src/mesa/main/config.h
@@ -170,6 +170,11 @@
 #define MAX_UNIFORM_BUFFERS            15 /* + 1 default uniform buffer */
 /* 6 is for vertex, hull, domain, geometry, fragment, and compute shader. */
 #define MAX_COMBINED_UNIFORM_BUFFERS   (MAX_UNIFORM_BUFFERS * 6)
+#define MAX_ATOMIC_COUNTERS            4096
+/* 6 is for vertex, hull, domain, geometry, fragment, and compute shader. */
+#define MAX_COMBINED_ATOMIC_BUFFERS    (MAX_UNIFORM_BUFFERS * 6)
+/* Size of an atomic counter in bytes according to ARB_shader_atomic_counters */
+#define ATOMIC_COUNTER_SIZE            4
 /*@}*/
 
 /**
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index 0d1f71c71..6cdeed19b 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -537,6 +537,9 @@ init_program_limits(struct gl_context *ctx, GLenum type,
    prog->MaxCombinedUniformComponents = (prog->MaxUniformComponents +
                                          ctx->Const.MaxUniformBlockSize / 4 *
                                          prog->MaxUniformBlocks);
+
+   prog->MaxAtomicBuffers = 0;
+   prog->MaxAtomicCounters = 0;
 }
 
 
@@ -669,6 +672,12 @@ _mesa_init_constants(struct gl_context *ctx)
    ctx->Const.MaxColorTextureSamples = 1;
    ctx->Const.MaxDepthTextureSamples = 1;
    ctx->Const.MaxIntegerSamples = 1;
+
+   /* GL_ARB_shader_atomic_counters */
+   ctx->Const.MaxAtomicBufferBindings = MAX_COMBINED_ATOMIC_BUFFERS;
+   ctx->Const.MaxAtomicBufferSize = MAX_ATOMIC_COUNTERS * ATOMIC_COUNTER_SIZE;
+   ctx->Const.MaxCombinedAtomicBuffers = MAX_COMBINED_ATOMIC_BUFFERS;
+   ctx->Const.MaxCombinedAtomicCounters = MAX_ATOMIC_COUNTERS;
 }
 
 
diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h
index 29469ce33..501192199 100644
--- a/mesalib/src/mesa/main/dd.h
+++ b/mesalib/src/mesa/main/dd.h
@@ -868,6 +868,20 @@ struct dd_function_table {
                              struct gl_framebuffer *fb,
                              GLuint index,
                              GLfloat *outValue);
+
+   /**
+    * \name NV_vdpau_interop interface
+    */
+   void (*VDPAUMapSurface)(struct gl_context *ctx, GLenum target,
+                           GLenum access, GLboolean output,
+                           struct gl_texture_object *texObj,
+                           struct gl_texture_image *texImage,
+                           const GLvoid *vdpSurface, GLuint index);
+   void (*VDPAUUnmapSurface)(struct gl_context *ctx, GLenum target,
+                             GLenum access, GLboolean output,
+                             struct gl_texture_object *texObj,
+                             struct gl_texture_image *texImage,
+                             const GLvoid *vdpSurface, GLuint index);
 };
 
 
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index e8e0a20d8..285ec377c 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -120,6 +120,7 @@ static const struct extension extension_table[] = {
    { "GL_ARB_robustness",                          o(dummy_true),                              GL,             2010 },
    { "GL_ARB_sampler_objects",                     o(dummy_true),                              GL,             2009 },
    { "GL_ARB_seamless_cube_map",                   o(ARB_seamless_cube_map),                   GL,             2009 },
+   { "GL_ARB_shader_atomic_counters",              o(ARB_shader_atomic_counters),              GL,             2011 },
    { "GL_ARB_shader_bit_encoding",                 o(ARB_shader_bit_encoding),                 GL,             2010 },
    { "GL_ARB_shader_objects",                      o(dummy_true),                              GL,             2002 },
    { "GL_ARB_shader_stencil_export",               o(ARB_shader_stencil_export),               GL,             2009 },
@@ -335,6 +336,7 @@ static const struct extension extension_table[] = {
    { "GL_NV_texture_barrier",                      o(NV_texture_barrier),                      GL,             2009 },
    { "GL_NV_texture_env_combine4",                 o(NV_texture_env_combine4),                 GLL,            1999 },
    { "GL_NV_texture_rectangle",                    o(NV_texture_rectangle),                    GLL,            2000 },
+   { "GL_NV_vdpau_interop",                        o(NV_vdpau_interop),                        GL,             2010 },
    { "GL_S3_s3tc",                                 o(ANGLE_texture_compression_dxt),           GL,             1999 },
    { "GL_SGIS_generate_mipmap",                    o(dummy_true),                              GLL,            1997 },
    { "GL_SGIS_texture_border_clamp",               o(ARB_texture_border_clamp),                GLL,            1997 },
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index 89b3bf09d..6e72ff5c2 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -143,6 +143,7 @@ enum value_extra {
    EXTRA_FLUSH_CURRENT,
    EXTRA_GLSL_130,
    EXTRA_EXT_UBO_GS4,
+   EXTRA_EXT_ATOMICS_GS4,
 };
 
 #define NO_EXTRA NULL
@@ -331,6 +332,11 @@ static const int extra_MESA_texture_array_es3[] = {
    EXTRA_END
 };
 
+static const int extra_ARB_shader_atomic_counters_and_geometry_shader[] = {
+   EXTRA_EXT_ATOMICS_GS4,
+   EXTRA_END
+};
+
 EXTRA_EXT(ARB_texture_cube_map);
 EXTRA_EXT(MESA_texture_array);
 EXTRA_EXT(NV_fog_distance);
@@ -367,6 +373,7 @@ EXTRA_EXT(ARB_texture_cube_map_array);
 EXTRA_EXT(ARB_texture_buffer_range);
 EXTRA_EXT(ARB_texture_multisample);
 EXTRA_EXT(ARB_texture_gather);
+EXTRA_EXT(ARB_shader_atomic_counters);
 
 static const int
 extra_ARB_color_buffer_float_or_glcore[] = {
@@ -894,6 +901,10 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu
          _mesa_problem(ctx, "driver doesn't implement GetTimestamp");
       }
       break;
+   /* GL_ARB_shader_atomic_counters */
+   case GL_ATOMIC_COUNTER_BUFFER_BINDING:
+      v->value_int = ctx->AtomicBuffer->Name;
+      break;
    }
 }
 
@@ -999,6 +1010,11 @@ check_extra(struct gl_context *ctx, const char *func, const struct value_desc *d
          api_found = (ctx->Extensions.ARB_uniform_buffer_object &&
                       _mesa_has_geometry_shaders(ctx));
          break;
+      case EXTRA_EXT_ATOMICS_GS4:
+         api_check = GL_TRUE;
+         api_found = (ctx->Extensions.ARB_shader_atomic_counters &&
+                      _mesa_has_geometry_shaders(ctx));
+         break;
       case EXTRA_END:
 	 break;
       default: /* *e is a offset into the extension struct */
@@ -1692,6 +1708,30 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v)
          goto invalid_enum;
       v->value_int = ctx->Multisample.SampleMaskValue;
       return TYPE_INT;
+
+   case GL_ATOMIC_COUNTER_BUFFER_BINDING:
+      if (!ctx->Extensions.ARB_shader_atomic_counters)
+         goto invalid_enum;
+      if (index >= ctx->Const.MaxAtomicBufferBindings)
+         goto invalid_value;
+      v->value_int = ctx->AtomicBufferBindings[index].BufferObject->Name;
+      return TYPE_INT;
+
+   case GL_ATOMIC_COUNTER_BUFFER_START:
+      if (!ctx->Extensions.ARB_shader_atomic_counters)
+         goto invalid_enum;
+      if (index >= ctx->Const.MaxAtomicBufferBindings)
+         goto invalid_value;
+      v->value_int64 = ctx->AtomicBufferBindings[index].Offset;
+      return TYPE_INT64;
+
+   case GL_ATOMIC_COUNTER_BUFFER_SIZE:
+      if (!ctx->Extensions.ARB_shader_atomic_counters)
+         goto invalid_enum;
+      if (index >= ctx->Const.MaxAtomicBufferBindings)
+         goto invalid_value;
+      v->value_int64 = ctx->AtomicBufferBindings[index].Size;
+      return TYPE_INT64;
    }
 
  invalid_enum:
diff --git a/mesalib/src/mesa/main/get_hash_params.py b/mesalib/src/mesa/main/get_hash_params.py
index 9c54af094..9f79f3406 100644
--- a/mesalib/src/mesa/main/get_hash_params.py
+++ b/mesalib/src/mesa/main/get_hash_params.py
@@ -722,6 +722,18 @@ descriptor=[
   [ "MAX_PROGRAM_TEXTURE_GATHER_OFFSET", "CONTEXT_INT(Const.MaxProgramTextureGatherOffset), extra_ARB_texture_gather"],
   [ "MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB", "CONTEXT_INT(Const.MaxProgramTextureGatherComponents), extra_ARB_texture_gather"],
 
+# GL_ARB_shader_atomic_counters
+  [ "ATOMIC_COUNTER_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_shader_atomic_counters" ],
+  [ "MAX_ATOMIC_COUNTER_BUFFER_BINDINGS", "CONTEXT_INT(Const.MaxAtomicBufferBindings), extra_ARB_shader_atomic_counters" ],
+  [ "MAX_ATOMIC_COUNTER_BUFFER_SIZE", "CONTEXT_INT(Const.MaxAtomicBufferSize), extra_ARB_shader_atomic_counters" ],
+  [ "MAX_VERTEX_ATOMIC_COUNTER_BUFFERS", "CONTEXT_INT(Const.VertexProgram.MaxAtomicBuffers), extra_ARB_shader_atomic_counters" ],
+  [ "MAX_VERTEX_ATOMIC_COUNTERS", "CONTEXT_INT(Const.VertexProgram.MaxAtomicCounters), extra_ARB_shader_atomic_counters" ],
+  [ "MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS", "CONTEXT_INT(Const.FragmentProgram.MaxAtomicBuffers), extra_ARB_shader_atomic_counters" ],
+  [ "MAX_FRAGMENT_ATOMIC_COUNTERS", "CONTEXT_INT(Const.FragmentProgram.MaxAtomicCounters), extra_ARB_shader_atomic_counters" ],
+  [ "MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS", "CONTEXT_INT(Const.GeometryProgram.MaxAtomicBuffers), extra_ARB_shader_atomic_counters_and_geometry_shader" ],
+  [ "MAX_GEOMETRY_ATOMIC_COUNTERS", "CONTEXT_INT(Const.GeometryProgram.MaxAtomicCounters), extra_ARB_shader_atomic_counters_and_geometry_shader" ],
+  [ "MAX_COMBINED_ATOMIC_COUNTER_BUFFERS", "CONTEXT_INT(Const.MaxCombinedAtomicBuffers), extra_ARB_shader_atomic_counters" ],
+  [ "MAX_COMBINED_ATOMIC_COUNTERS", "CONTEXT_INT(Const.MaxCombinedAtomicCounters), extra_ARB_shader_atomic_counters" ],
 ]},
 
 # Enums restricted to OpenGL Core profile
diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h
index 53e40b445..d79e2a339 100644
--- a/mesalib/src/mesa/main/imports.h
+++ b/mesalib/src/mesa/main/imports.h
@@ -141,6 +141,7 @@ static inline float acoshf(float x) { return logf(x + sqrtf(x * x - 1.0f)); }
 static inline float atanhf(float x) { return (logf(1.0f + x) - logf(1.0f - x)) / 2.0f; }
 static inline int isblank(int ch) { return ch == ' ' || ch == '\t'; }
 #define strtoll(p, e, b) _strtoi64(p, e, b)
+#define strcasecmp(s1, s2) _stricmp(s1, s2)
 #endif
 /*@}*/
 
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 97ed1bd6a..a1a5eb4bf 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -2375,6 +2375,25 @@ struct gl_uniform_block
    enum gl_uniform_block_packing _Packing;
 };
 
+/**
+ * Structure that represents a reference to an atomic buffer from some
+ * shader program.
+ */
+struct gl_active_atomic_buffer
+{
+   /** Uniform indices of the atomic counters declared within it. */
+   GLuint *Uniforms;
+   GLuint NumUniforms;
+
+   /** Binding point index associated with it. */
+   GLuint Binding;
+
+   /** Minimum reasonable size it is expected to have. */
+   GLuint MinimumSize;
+
+   /** Shader stages making use of it. */
+   GLboolean StageReferences[MESA_SHADER_TYPES];
+};
 
 /**
  * A GLSL program object.
@@ -2523,6 +2542,9 @@ struct gl_shader_program
     */
    struct string_to_uint_map *UniformHash;
 
+   struct gl_active_atomic_buffer *AtomicBuffers;
+   unsigned NumAtomicBuffers;
+
    GLboolean LinkStatus;   /**< GL_LINK_STATUS */
    GLboolean Validated;
    GLboolean _Used;        /**< Ever used for drawing? */
@@ -2960,6 +2982,9 @@ struct gl_program_constants
    GLuint MaxUniformBlocks;
    GLuint MaxCombinedUniformComponents;
    GLuint MaxTextureImageUnits;
+   /* GL_ARB_shader_atomic_counters */
+   GLuint MaxAtomicBuffers;
+   GLuint MaxAtomicCounters;
 };
 
 
@@ -3166,6 +3191,12 @@ struct gl_constants
    GLint MaxColorTextureSamples;
    GLint MaxDepthTextureSamples;
    GLint MaxIntegerSamples;
+
+   /** GL_ARB_shader_atomic_counters */
+   GLuint MaxAtomicBufferBindings;
+   GLuint MaxAtomicBufferSize;
+   GLuint MaxCombinedAtomicBuffers;
+   GLuint MaxCombinedAtomicCounters;
 };
 
 
@@ -3209,6 +3240,7 @@ struct gl_extensions
    GLboolean ARB_occlusion_query2;
    GLboolean ARB_point_sprite;
    GLboolean ARB_seamless_cube_map;
+   GLboolean ARB_shader_atomic_counters;
    GLboolean ARB_shader_bit_encoding;
    GLboolean ARB_shader_stencil_export;
    GLboolean ARB_shader_texture_lod;
@@ -3302,6 +3334,7 @@ struct gl_extensions
    GLboolean NV_texture_barrier;
    GLboolean NV_texture_env_combine4;
    GLboolean NV_texture_rectangle;
+   GLboolean NV_vdpau_interop;
    GLboolean TDFX_texture_compression_FXT1;
    GLboolean OES_EGL_image;
    GLboolean OES_draw_texture;
@@ -3581,6 +3614,11 @@ struct gl_driver_flags
     * gl_shader_program::UniformBlocks
     */
    GLbitfield NewUniformBuffer;
+
+   /**
+    * gl_context::AtomicBufferBindings
+    */
+   GLbitfield NewAtomicBuffer;
 };
 
 struct gl_uniform_buffer_binding
@@ -3598,6 +3636,16 @@ struct gl_uniform_buffer_binding
 };
 
 /**
+ * Binding point for an atomic counter buffer object.
+ */
+struct gl_atomic_buffer_binding
+{
+   struct gl_buffer_object *BufferObject;
+   GLintptr Offset;
+   GLsizeiptr Size;
+};
+
+/**
  * Mesa rendering context.
  *
  * This is the central context data structure for Mesa.  Almost all
@@ -3765,6 +3813,18 @@ struct gl_context
    struct gl_uniform_buffer_binding
       UniformBufferBindings[MAX_COMBINED_UNIFORM_BUFFERS];
 
+   /**
+    * Object currently associated with the GL_ATOMIC_COUNTER_BUFFER
+    * target.
+    */
+   struct gl_buffer_object *AtomicBuffer;
+
+   /**
+    * Array of atomic counter buffer binding points.
+    */
+   struct gl_atomic_buffer_binding
+      AtomicBufferBindings[MAX_COMBINED_ATOMIC_BUFFERS];
+
    /*@}*/
 
    struct gl_meta_state *Meta;  /**< for "meta" operations */
@@ -3832,6 +3892,15 @@ struct gl_context
    struct st_context *st;
    void *aelt_context;
    /*@}*/
+
+   /**
+    * \name NV_vdpau_interop
+    */
+   /*@{*/
+   const void *vdpDevice;
+   const void *vdpGetProcAddress;
+   struct set *vdpSurfaces;
+   /*@}*/
 };
 
 
diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index a18013369..86e7c3ad0 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -202,13 +202,6 @@ _mesa_GenQueries(GLsizei n, GLuint *ids)
       return;
    }
 
-   /* No query objects can be active at this time! */
-   if (ctx->Query.CurrentOcclusionObject ||
-       ctx->Query.CurrentTimerObject) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGenQueriesARB");
-      return;
-   }
-
    first = _mesa_HashFindFreeKeyBlock(ctx->Query.QueryObjects, n);
    if (first) {
       GLsizei i;
@@ -241,18 +234,20 @@ _mesa_DeleteQueries(GLsizei n, const GLuint *ids)
       return;
    }
 
-   /* No query objects can be active at this time! */
-   if (ctx->Query.CurrentOcclusionObject ||
-       ctx->Query.CurrentTimerObject) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteQueriesARB");
-      return;
-   }
-
    for (i = 0; i < n; i++) {
       if (ids[i] > 0) {
          struct gl_query_object *q = _mesa_lookup_query_object(ctx, ids[i]);
          if (q) {
-            ASSERT(!q->Active); /* should be caught earlier */
+            if (q->Active) {
+               struct gl_query_object **bindpt;
+               bindpt = get_query_binding_point(ctx, q->Target);
+               assert(bindpt); /* Should be non-null for active q. */
+               if (bindpt) {
+                  *bindpt = NULL;
+               }
+               q->Active = GL_FALSE;
+               ctx->Driver.EndQuery(ctx, q);
+            }
             _mesa_HashRemove(ctx->Query.QueryObjects, ids[i]);
             ctx->Driver.DeleteQuery(ctx, q);
          }
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index f5c04b9f3..7da860ddf 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -648,6 +648,12 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param
    case GL_PROGRAM_BINARY_LENGTH:
       *params = 0;
       return;
+   case GL_ACTIVE_ATOMIC_COUNTER_BUFFERS:
+      if (!ctx->Extensions.ARB_shader_atomic_counters)
+         break;
+
+      *params = shProg->NumAtomicBuffers;
+      return;
    default:
       break;
    }
@@ -926,7 +932,7 @@ _mesa_active_program(struct gl_context *ctx, struct gl_shader_program *shProg,
 
 /**
  */
-static bool
+static void
 use_shader_program(struct gl_context *ctx, GLenum type,
 		   struct gl_shader_program *shProg)
 {
@@ -955,7 +961,7 @@ use_shader_program(struct gl_context *ctx, GLenum type,
       }
       break;
    default:
-      return false;
+      return;
    }
 
    if (*target != shProg) {
@@ -982,10 +988,8 @@ use_shader_program(struct gl_context *ctx, GLenum type,
       }
 
       _mesa_reference_shader_program(ctx, target, shProg);
-      return true;
+      return;
    }
-
-   return false;
 }
 
 /**
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index c9d928f63..d56b7d9d7 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -23,7 +23,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/** 
+/**
  * \file texparam.c
  *
  * glTexParameter-related functions
@@ -52,7 +52,7 @@
  * Check if a coordinate wrap mode is supported for the texture target.
  * \return GL_TRUE if legal, GL_FALSE otherwise
  */
-static GLboolean 
+static GLboolean
 validate_texture_wrap_mode(struct gl_context * ctx, GLenum target, GLenum wrap)
 {
    const struct gl_extensions * const e = & ctx->Extensions;
@@ -91,7 +91,7 @@ validate_texture_wrap_mode(struct gl_context * ctx, GLenum target, GLenum wrap)
       break;
 
    case GL_MIRROR_CLAMP_TO_EDGE_EXT:
-      supported = is_desktop_gl 
+      supported = is_desktop_gl
          && (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp || e->ARB_texture_mirror_clamp_to_edge)
          && (target != GL_TEXTURE_RECTANGLE_NV)
          && (target != GL_TEXTURE_EXTERNAL_OES);
@@ -1787,7 +1787,7 @@ _mesa_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
    texObj = get_texobj(ctx, target, GL_TRUE);
    if (!texObj)
       return;
-   
+
    switch (pname) {
    case GL_TEXTURE_BORDER_COLOR:
       COPY_4V(params, texObj->Sampler.BorderColor.i);
@@ -1808,7 +1808,7 @@ _mesa_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
    texObj = get_texobj(ctx, target, GL_TRUE);
    if (!texObj)
       return;
-   
+
    switch (pname) {
    case GL_TEXTURE_BORDER_COLOR:
       COPY_4V(params, texObj->Sampler.BorderColor.i);
@@ -1818,7 +1818,7 @@ _mesa_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
          GLint ip[4];
          _mesa_GetTexParameteriv(target, pname, ip);
          params[0] = ip[0];
-         if (pname == GL_TEXTURE_SWIZZLE_RGBA_EXT || 
+         if (pname == GL_TEXTURE_SWIZZLE_RGBA_EXT ||
              pname == GL_TEXTURE_CROP_RECT_OES) {
             params[1] = ip[1];
             params[2] = ip[2];
diff --git a/mesalib/src/mesa/main/uniform_query.cpp b/mesalib/src/mesa/main/uniform_query.cpp
index 3c460042e..88ad476ac 100644
--- a/mesalib/src/mesa/main/uniform_query.cpp
+++ b/mesalib/src/mesa/main/uniform_query.cpp
@@ -154,11 +154,21 @@ _mesa_GetActiveUniformsiv(GLuint program,
 	 params[i] = uni->row_major;
 	 break;
 
+      case GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX:
+         if (!ctx->Extensions.ARB_shader_atomic_counters)
+            goto invalid_enum;
+         params[i] = uni->atomic_buffer_index;
+         break;
+
       default:
-	 _mesa_error(ctx, GL_INVALID_ENUM, "glGetActiveUniformsiv(pname)");
-	 return;
+         goto invalid_enum;
       }
    }
+
+   return;
+
+ invalid_enum:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetActiveUniformsiv(pname)");
 }
 
 static bool
diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c
index 1e6f7f483..2e847fe31 100644
--- a/mesalib/src/mesa/main/uniforms.c
+++ b/mesalib/src/mesa/main/uniforms.c
@@ -535,7 +535,8 @@ _mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name)
     *      with a named uniform block, or if <name> starts with the reserved
     *      prefix "gl_"."
     */
-   if (shProg->UniformStorage[index].block_index != -1)
+   if (shProg->UniformStorage[index].block_index != -1 ||
+       shProg->UniformStorage[index].atomic_buffer_index != -1)
       return -1;
 
    return _mesa_uniform_merge_location_offset(shProg, index, offset);
@@ -844,3 +845,68 @@ _mesa_get_uniform_name(const struct gl_uniform_storage *uni,
       *length += i;
    }
 }
+
+void GLAPIENTRY
+_mesa_GetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex,
+                                     GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_shader_program *shProg;
+   struct gl_active_atomic_buffer *ab;
+   int i;
+
+   if (!ctx->Extensions.ARB_shader_atomic_counters) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetActiveAtomicCounterBufferiv");
+      return;
+   }
+
+   shProg = _mesa_lookup_shader_program_err(ctx, program,
+                                            "glGetActiveAtomicCounterBufferiv");
+   if (!shProg)
+      return;
+
+   if (bufferIndex >= shProg->NumAtomicBuffers) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glGetActiveAtomicCounterBufferiv(bufferIndex)");
+      return;
+   }
+
+   ab = &shProg->AtomicBuffers[bufferIndex];
+
+   switch (pname) {
+   case GL_ATOMIC_COUNTER_BUFFER_BINDING:
+      params[0] = ab->Binding;
+      return;
+   case GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE:
+      params[0] = ab->MinimumSize;
+      return;
+   case GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS:
+      params[0] = ab->NumUniforms;
+      return;
+   case GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES:
+      for (i = 0; i < ab->NumUniforms; ++i)
+         params[i] = ab->Uniforms[i];
+      return;
+   case GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER:
+      params[0] = ab->StageReferences[MESA_SHADER_VERTEX];
+      return;
+   case GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER:
+      params[0] = ab->StageReferences[MESA_SHADER_GEOMETRY];
+      return;
+   case GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER:
+      params[0] = ab->StageReferences[MESA_SHADER_FRAGMENT];
+      return;
+   case GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER:
+      params[0] = GL_FALSE;
+      return;
+   case GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER:
+      params[0] = GL_FALSE;
+      return;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glGetActiveAtomicCounterBufferiv(pname 0x%x (%s))",
+                  pname, _mesa_lookup_enum_by_nr(pname));
+      return;
+   }
+}
diff --git a/mesalib/src/mesa/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h
index 92239176e..f7cac6328 100644
--- a/mesalib/src/mesa/main/uniforms.h
+++ b/mesalib/src/mesa/main/uniforms.h
@@ -142,6 +142,9 @@ _mesa_UniformBlockBinding(GLuint program,
 			  GLuint uniformBlockIndex,
 			  GLuint uniformBlockBinding);
 void GLAPIENTRY
+_mesa_GetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex,
+                                     GLenum pname, GLint *params);
+void GLAPIENTRY
 _mesa_GetActiveUniformBlockiv(GLuint program,
 			      GLuint uniformBlockIndex,
 			      GLenum pname,
diff --git a/mesalib/src/mesa/main/vdpau.c b/mesalib/src/mesa/main/vdpau.c
new file mode 100644
index 000000000..e21a26b43
--- /dev/null
+++ b/mesalib/src/mesa/main/vdpau.c
@@ -0,0 +1,424 @@
+/**************************************************************************
+ *
+ * Copyright 2013 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, 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 THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ **************************************************************************/
+
+/*
+ * Authors:
+ *      Christian König <christian.koenig@amd.com>
+ *
+ */
+
+#include <stdbool.h>
+#include "context.h"
+#include "glformats.h"
+#include "hash_table.h"
+#include "set.h"
+#include "texobj.h"
+#include "teximage.h"
+#include "vdpau.h"
+
+#define MAX_TEXTURES 4
+
+struct vdp_surface
+{
+   GLenum target;
+   struct gl_texture_object *textures[MAX_TEXTURES];
+   GLenum access, state;
+   GLboolean output;
+   const GLvoid *vdpSurface;
+};
+
+void GLAPIENTRY
+_mesa_VDPAUInitNV(const GLvoid *vdpDevice, const GLvoid *getProcAddress)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!vdpDevice) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "vdpDevice");
+      return;
+   }
+
+   if (!getProcAddress) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "getProcAddress");
+      return;
+   }
+
+   if (ctx->vdpDevice || ctx->vdpGetProcAddress || ctx->vdpSurfaces) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUInitNV");
+      return;
+   }
+
+   ctx->vdpDevice = vdpDevice;
+   ctx->vdpGetProcAddress = getProcAddress;
+   ctx->vdpSurfaces = _mesa_set_create(NULL, _mesa_key_pointer_equal);
+}
+
+static void
+unregister_surface(struct set_entry *entry)
+{
+   struct vdp_surface *surf = (struct vdp_surface *)entry->key;
+   GET_CURRENT_CONTEXT(ctx);
+   
+   if (surf->state == GL_SURFACE_MAPPED_NV) {
+      GLintptr surfaces[] = { (GLintptr)surf };
+      _mesa_VDPAUUnmapSurfacesNV(1, surfaces);
+   }
+
+   _mesa_set_remove(ctx->vdpSurfaces, entry);
+   FREE(surf);
+}
+
+void GLAPIENTRY
+_mesa_VDPAUFiniNV(void)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx->vdpDevice || !ctx->vdpGetProcAddress || !ctx->vdpSurfaces) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUFiniNV");
+      return;
+   }
+
+   _mesa_set_destroy(ctx->vdpSurfaces, unregister_surface);
+
+   ctx->vdpDevice = 0;
+   ctx->vdpGetProcAddress = 0;
+   ctx->vdpSurfaces = NULL;
+}
+
+static GLintptr
+register_surface(struct gl_context *ctx, GLboolean isOutput,
+                 const GLvoid *vdpSurface, GLenum target,
+                 GLsizei numTextureNames, const GLuint *textureNames)
+{
+   struct vdp_surface *surf;
+   int i;
+
+   if (!ctx->vdpDevice || !ctx->vdpGetProcAddress || !ctx->vdpSurfaces) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAURegisterSurfaceNV");
+      return (GLintptr)NULL;
+   }
+
+   if (target != GL_TEXTURE_2D && target != GL_TEXTURE_RECTANGLE) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "VDPAURegisterSurfaceNV");
+      return (GLintptr)NULL;
+   }
+
+   if (target == GL_TEXTURE_RECTANGLE && !ctx->Extensions.NV_texture_rectangle) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "VDPAURegisterSurfaceNV");
+      return (GLintptr)NULL;
+   }
+
+   surf = CALLOC_STRUCT( vdp_surface );
+   surf->vdpSurface = vdpSurface;
+   surf->target = target;
+   surf->access = GL_READ_WRITE;
+   surf->state = GL_SURFACE_REGISTERED_NV;
+   surf->output = isOutput;
+   for (i = 0; i < numTextureNames; ++i) {
+      struct gl_texture_object *tex;
+      tex  = _mesa_lookup_texture(ctx, textureNames[i]);
+
+      _mesa_lock_texture(ctx, tex);
+
+      if (tex->Immutable) {
+         _mesa_unlock_texture(ctx, tex);
+         FREE(surf);
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "VDPAURegisterSurfaceNV(texture is immutable)");
+         return (GLintptr)NULL;
+      }
+
+      if (tex->Target == 0)
+         tex->Target = target;
+      else if (tex->Target != target) {
+         _mesa_unlock_texture(ctx, tex);
+         FREE(surf);
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "VDPAURegisterSurfaceNV(target mismatch)");
+         return (GLintptr)NULL;
+      }
+
+      /* This will disallow respecifying the storage. */
+      tex->Immutable = GL_TRUE;
+      _mesa_unlock_texture(ctx, tex);
+
+      _mesa_reference_texobj(&surf->textures[i], tex);
+   }
+
+   _mesa_set_add(ctx->vdpSurfaces, _mesa_hash_pointer(surf), surf);
+
+   return (GLintptr)surf;
+}
+
+GLintptr GLAPIENTRY
+_mesa_VDPAURegisterVideoSurfaceNV(const GLvoid *vdpSurface, GLenum target,
+                                  GLsizei numTextureNames,
+                                  const GLuint *textureNames)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (numTextureNames != 4) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "VDPAURegisterVideoSurfaceNV");
+      return (GLintptr)NULL;
+   }
+
+   return register_surface(ctx, false, vdpSurface, target,
+                           numTextureNames, textureNames);
+}
+
+GLintptr GLAPIENTRY
+_mesa_VDPAURegisterOutputSurfaceNV(const GLvoid *vdpSurface, GLenum target,
+                                   GLsizei numTextureNames,
+                                   const GLuint *textureNames)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (numTextureNames != 1) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "VDPAURegisterVideoSurfaceNV");
+      return (GLintptr)NULL;
+   }
+
+   return register_surface(ctx, true, vdpSurface, target,
+                           numTextureNames, textureNames);
+}
+
+void GLAPIENTRY
+_mesa_VDPAUIsSurfaceNV(GLintptr surface)
+{
+   struct vdp_surface *surf = (struct vdp_surface *)surface;
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx->vdpDevice || !ctx->vdpGetProcAddress || !ctx->vdpSurfaces) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUIsSurfaceNV");
+      return;
+   }
+
+   if (!_mesa_set_search(ctx->vdpSurfaces, _mesa_hash_pointer(surf), surf)) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "VDPAUIsSurfaceNV");
+      return;
+   }
+}
+
+void GLAPIENTRY
+_mesa_VDPAUUnregisterSurfaceNV(GLintptr surface)
+{
+   struct vdp_surface *surf = (struct vdp_surface *)surface;
+   struct set_entry *entry;
+   int i;
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx->vdpDevice || !ctx->vdpGetProcAddress || !ctx->vdpSurfaces) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUUnregisterSurfaceNV");
+      return;
+   }
+
+   /* according to the spec it's ok when this is zero */
+   if (surface == 0)
+      return;
+
+   entry = _mesa_set_search(ctx->vdpSurfaces, _mesa_hash_pointer(surf), surf);
+   if (!entry) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "VDPAUUnregisterSurfaceNV");
+      return;
+   }
+
+   for (i = 0; i < MAX_TEXTURES; i++) {
+      if (surf->textures[i]) {
+         surf->textures[i]->Immutable = GL_FALSE;
+         _mesa_reference_texobj(&surf->textures[i], NULL);
+      }
+   }
+
+   _mesa_set_remove(ctx->vdpSurfaces, entry);
+   FREE(surf);
+}
+
+void GLAPIENTRY
+_mesa_VDPAUGetSurfaceivNV(GLintptr surface, GLenum pname, GLsizei bufSize,
+                          GLsizei *length, GLint *values)
+{
+   struct vdp_surface *surf = (struct vdp_surface *)surface;
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx->vdpDevice || !ctx->vdpGetProcAddress || !ctx->vdpSurfaces) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUGetSurfaceivNV");
+      return;
+   }
+
+   if (!_mesa_set_search(ctx->vdpSurfaces, _mesa_hash_pointer(surf), surf)) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "VDPAUGetSurfaceivNV");
+      return;
+   }
+
+   if (pname != GL_SURFACE_STATE_NV) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "VDPAUGetSurfaceivNV");
+      return;
+   }
+
+   if (bufSize < 1) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "VDPAUGetSurfaceivNV");
+      return;
+   }
+
+   values[0] = surf->state;
+
+   if (length != NULL)
+      *length = 1;
+}
+
+void GLAPIENTRY
+_mesa_VDPAUSurfaceAccessNV(GLintptr surface, GLenum access)
+{
+   struct vdp_surface *surf = (struct vdp_surface *)surface;
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx->vdpDevice || !ctx->vdpGetProcAddress || !ctx->vdpSurfaces) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUSurfaceAccessNV");
+      return;
+   }
+
+   if (!_mesa_set_search(ctx->vdpSurfaces, _mesa_hash_pointer(surf), surf)) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "VDPAUSurfaceAccessNV");
+      return;
+   }
+
+   if (access != GL_READ_ONLY && access != GL_WRITE_ONLY &&
+       access != GL_READ_WRITE) {
+
+      _mesa_error(ctx, GL_INVALID_VALUE, "VDPAUSurfaceAccessNV");
+      return;
+   }
+
+   if (surf->state == GL_SURFACE_MAPPED_NV) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUSurfaceAccessNV");
+      return;
+   }
+
+   surf->access = access;
+}
+
+void GLAPIENTRY
+_mesa_VDPAUMapSurfacesNV(GLsizei numSurfaces, const GLintptr *surfaces)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   int i, j;
+
+   if (!ctx->vdpDevice || !ctx->vdpGetProcAddress || !ctx->vdpSurfaces) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUUnmapSurfacesNV");
+      return;
+   }
+
+   for (i = 0; i < numSurfaces; ++i) {
+      struct vdp_surface *surf = (struct vdp_surface *)surfaces[i];
+
+      if (!_mesa_set_search(ctx->vdpSurfaces, _mesa_hash_pointer(surf), surf)) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "VDPAUSurfaceAccessNV");
+         return;
+      }
+
+      if (surf->state == GL_SURFACE_MAPPED_NV) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUSurfaceAccessNV");
+         return;
+      }
+   }
+
+   for (i = 0; i < numSurfaces; ++i) {
+      struct vdp_surface *surf = (struct vdp_surface *)surfaces[i];
+      unsigned numTextureNames = surf->output ? 1 : 4;
+
+      for (j = 0; j < numTextureNames; ++j) {
+         struct gl_texture_object *tex = surf->textures[j];
+         struct gl_texture_image *image;
+
+         _mesa_lock_texture(ctx, tex);
+         image = _mesa_get_tex_image(ctx, tex, surf->target, 0);
+         if (!image) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "VDPAUMapSurfacesNV");
+            _mesa_unlock_texture(ctx, tex);
+            return;
+         }
+
+         ctx->Driver.FreeTextureImageBuffer(ctx, image);
+
+         ctx->Driver.VDPAUMapSurface(ctx, surf->target, surf->access,
+                                     surf->output, tex, image,
+                                     surf->vdpSurface, j);
+
+         _mesa_unlock_texture(ctx, tex);
+      }
+      surf->state = GL_SURFACE_MAPPED_NV;
+   }
+}
+
+void GLAPIENTRY
+_mesa_VDPAUUnmapSurfacesNV(GLsizei numSurfaces, const GLintptr *surfaces)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   int i, j;
+
+   if (!ctx->vdpDevice || !ctx->vdpGetProcAddress || !ctx->vdpSurfaces) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUUnmapSurfacesNV");
+      return;
+   }
+
+   for (i = 0; i < numSurfaces; ++i) {
+      struct vdp_surface *surf = (struct vdp_surface *)surfaces[i];
+
+      if (!_mesa_set_search(ctx->vdpSurfaces, _mesa_hash_pointer(surf), surf)) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "VDPAUSurfaceAccessNV");
+         return;
+      }
+
+      if (surf->state != GL_SURFACE_MAPPED_NV) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUSurfaceAccessNV");
+         return;
+      }
+   }
+
+   for (i = 0; i < numSurfaces; ++i) {
+      struct vdp_surface *surf = (struct vdp_surface *)surfaces[i];
+      unsigned numTextureNames = surf->output ? 1 : 4;
+
+      for (j = 0; j < numTextureNames; ++j) {
+         struct gl_texture_object *tex = surf->textures[j];
+         struct gl_texture_image *image;
+
+         _mesa_lock_texture(ctx, tex);
+
+         image = _mesa_select_tex_image(ctx, tex, surf->target, 0);
+
+         ctx->Driver.VDPAUUnmapSurface(ctx, surf->target, surf->access,
+                                       surf->output, tex, image,
+                                       surf->vdpSurface, j);
+
+         if (image)
+            ctx->Driver.FreeTextureImageBuffer(ctx, image);
+
+         _mesa_unlock_texture(ctx, tex);
+      }
+      surf->state = GL_SURFACE_REGISTERED_NV;
+   }
+}
diff --git a/mesalib/src/mesa/main/vdpau.h b/mesalib/src/mesa/main/vdpau.h
new file mode 100644
index 000000000..f32d6dacb
--- /dev/null
+++ b/mesalib/src/mesa/main/vdpau.h
@@ -0,0 +1,72 @@
+/**************************************************************************
+ *
+ * Copyright 2013 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, 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 THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ **************************************************************************/
+
+/*
+ * Authors:
+ *      Christian König <christian.koenig@amd.com>
+ *
+ */
+
+#ifndef VDPAU_H
+#define VDPAU_H
+
+extern void GLAPIENTRY
+_mesa_VDPAUInitNV(const GLvoid *vdpDevice, const GLvoid *getProcAddress);
+
+extern void GLAPIENTRY
+_mesa_VDPAUFiniNV(void);
+
+extern GLintptr GLAPIENTRY
+_mesa_VDPAURegisterVideoSurfaceNV(const GLvoid *vdpSurface, GLenum target,
+                                  GLsizei numTextureNames,
+                                  const GLuint *textureNames);
+
+extern GLintptr GLAPIENTRY
+_mesa_VDPAURegisterOutputSurfaceNV(const GLvoid *vdpSurface, GLenum target,
+                                   GLsizei numTextureNames,
+                                   const GLuint *textureNames);
+
+extern void GLAPIENTRY
+_mesa_VDPAUIsSurfaceNV(GLintptr surface);
+
+extern void GLAPIENTRY
+_mesa_VDPAUUnregisterSurfaceNV(GLintptr surface);
+
+extern void GLAPIENTRY
+_mesa_VDPAUGetSurfaceivNV(GLintptr surface, GLenum pname, GLsizei bufSize,
+                          GLsizei *length, GLint *values);
+
+extern void GLAPIENTRY
+_mesa_VDPAUSurfaceAccessNV(GLintptr surface, GLenum access);
+
+extern void GLAPIENTRY
+_mesa_VDPAUMapSurfacesNV(GLsizei numSurfaces, const GLintptr *surfaces);
+
+extern void GLAPIENTRY
+_mesa_VDPAUUnmapSurfacesNV(GLsizei numSurfaces, const GLintptr *surfaces);
+
+#endif /* VDPAU_H */
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index cfad91bc4..c833a12f2 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -622,6 +622,7 @@ type_size(const struct glsl_type *type)
        * at link time.
        */
       return 1;
+   case GLSL_TYPE_ATOMIC_UINT:
    case GLSL_TYPE_VOID:
    case GLSL_TYPE_ERROR:
    case GLSL_TYPE_INTERFACE:
@@ -2601,6 +2602,7 @@ _mesa_associate_uniform_storage(struct gl_context *ctx,
 	    format = uniform_native;
 	    columns = 1;
 	    break;
+         case GLSL_TYPE_ATOMIC_UINT:
          case GLSL_TYPE_ARRAY:
          case GLSL_TYPE_VOID:
          case GLSL_TYPE_STRUCT:
diff --git a/mesalib/src/mesa/state_tracker/st_context.c b/mesalib/src/mesa/state_tracker/st_context.c
index 4e0d98cc3..2cc3567e0 100644
--- a/mesalib/src/mesa/state_tracker/st_context.c
+++ b/mesalib/src/mesa/state_tracker/st_context.c
@@ -65,6 +65,7 @@
 #include "st_extensions.h"
 #include "st_gen_mipmap.h"
 #include "st_program.h"
+#include "st_vdpau.h"
 #include "pipe/p_context.h"
 #include "util/u_inlines.h"
 #include "util/u_upload_mgr.h"
@@ -360,5 +361,7 @@ void st_init_driver_functions(struct dd_function_table *functions)
    st_init_xformfb_functions(functions);
    st_init_syncobj_functions(functions);
 
+   st_init_vdpau_functions(functions);
+
    functions->UpdateState = st_invalidate_state;
 }
diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c
index c35723087..51bb23807 100644
--- a/mesalib/src/mesa/state_tracker/st_draw.c
+++ b/mesalib/src/mesa/state_tracker/st_draw.c
@@ -210,9 +210,6 @@ st_draw_vbo(struct gl_context *ctx,
    if (st->dirty.st || ctx->NewDriverState) {
       st_validate_state(st);
 
-      if (st->vertex_array_out_of_memory)
-         return;
-
 #if 0
       if (MESA_VERBOSE & VERBOSE_GLSL) {
          check_uniforms(ctx);
@@ -222,6 +219,10 @@ st_draw_vbo(struct gl_context *ctx,
 #endif
    }
 
+   if (st->vertex_array_out_of_memory) {
+      return;
+   }
+
    util_draw_init_info(&info);
 
    if (ib) {
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 231bb395a..97c5d55e1 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -445,8 +445,7 @@ void st_init_extensions(struct st_context *st)
         { PIPE_FORMAT_Z32_FLOAT,
           PIPE_FORMAT_Z32_FLOAT_S8X24_UINT } },
 
-      { { o(ARB_framebuffer_object),
-          o(EXT_packed_depth_stencil) },
+      { { o(EXT_packed_depth_stencil) },
         { PIPE_FORMAT_S8_UINT_Z24_UNORM,
           PIPE_FORMAT_Z24_UNORM_S8_UINT },
         GL_TRUE }, /* at least one format must be supported */
@@ -565,6 +564,7 @@ void st_init_extensions(struct st_context *st)
    ctx->Extensions.NV_fog_distance = GL_TRUE;
    ctx->Extensions.NV_texture_env_combine4 = GL_TRUE;
    ctx->Extensions.NV_texture_rectangle = GL_TRUE;
+   ctx->Extensions.NV_vdpau_interop = GL_TRUE;
 
    ctx->Extensions.OES_EGL_image = GL_TRUE;
    ctx->Extensions.OES_EGL_image_external = GL_TRUE;
@@ -760,6 +760,10 @@ void st_init_extensions(struct st_context *st)
                              PIPE_BUFFER, PIPE_BIND_SAMPLER_VIEW);
    }
 
+   if (screen->get_param(screen, PIPE_CAP_MIXED_FRAMEBUFFER_SIZES) &&
+       ctx->Extensions.EXT_packed_depth_stencil) {
+      ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
+   }
 
    /* Unpacking a varying in the fragment shader costs 1 texture indirection.
     * If the number of available texture indirections is very limited, then we
diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 3e11cce24..0eaf7467b 100644
--- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -993,6 +993,7 @@ type_size(const struct glsl_type *type)
        * at link time.
        */
       return 1;
+   case GLSL_TYPE_ATOMIC_UINT:
    case GLSL_TYPE_INTERFACE:
    case GLSL_TYPE_VOID:
    case GLSL_TYPE_ERROR:
diff --git a/mesalib/src/mesa/state_tracker/st_vdpau.c b/mesalib/src/mesa/state_tracker/st_vdpau.c
new file mode 100644
index 000000000..9b165ee39
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_vdpau.c
@@ -0,0 +1,181 @@
+/**************************************************************************
+ *
+ * Copyright 2013 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, 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 THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ **************************************************************************/
+
+/*
+ * Authors:
+ *      Christian König <christian.koenig@amd.com>
+ *
+ */
+
+#include "main/texobj.h"
+#include "main/teximage.h"
+#include "main/errors.h"
+#include "program/prog_instruction.h"
+
+#include "pipe/p_state.h"
+#include "pipe/p_video_codec.h"
+
+#include "state_tracker/vdpau_interop.h"
+
+#include "util/u_inlines.h"
+
+#include "st_vdpau.h"
+#include "st_context.h"
+#include "st_texture.h"
+#include "st_format.h"
+
+static void
+st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access,
+                     GLboolean output, struct gl_texture_object *texObj,
+                     struct gl_texture_image *texImage,
+                     const GLvoid *vdpSurface, GLuint index)
+{
+   int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr);
+   uint32_t device = (uintptr_t)ctx->vdpDevice;
+
+   struct st_context *st = st_context(ctx);
+   struct st_texture_object *stObj = st_texture_object(texObj);
+   struct st_texture_image *stImage = st_texture_image(texImage);
+ 
+   struct pipe_resource *res;
+   struct pipe_sampler_view *sv, templ;
+   gl_format texFormat;
+
+   getProcAddr = ctx->vdpGetProcAddress;
+   if (output) {
+      VdpOutputSurfaceGallium *f;
+      
+      if (getProcAddr(device, VDP_FUNC_ID_OUTPUT_SURFACE_GALLIUM, (void**)&f)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
+         return;
+      }
+
+      res = f((uintptr_t)vdpSurface);
+
+      if (!res) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
+         return;
+      }
+
+   } else {
+      VdpVideoSurfaceGallium *f;
+
+      struct pipe_video_buffer *buffer;
+      struct pipe_sampler_view **samplers;
+
+      if (getProcAddr(device, VDP_FUNC_ID_VIDEO_SURFACE_GALLIUM, (void**)&f)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
+         return;
+      }
+
+      buffer = f((uintptr_t)vdpSurface);
+      if (!buffer) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
+         return;
+      }
+
+      samplers = buffer->get_sampler_view_planes(buffer);
+      if (!samplers) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
+         return;
+      }
+
+      sv = samplers[index >> 1];
+      if (!sv) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
+         return;
+      }
+
+      res = sv->texture;
+   }
+
+   if (!res) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
+      return;
+   }
+
+   /* do we have different screen objects ? */
+   if (res->screen != st->pipe->screen) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
+      return;
+   }
+
+   /* switch to surface based */
+   if (!stObj->surface_based) {
+      _mesa_clear_texture_object(ctx, texObj);
+      stObj->surface_based = GL_TRUE;
+   }
+
+   texFormat = st_pipe_format_to_mesa_format(res->format);
+
+   _mesa_init_teximage_fields(ctx, texImage,
+                              res->width0, res->height0, 1, 0, GL_RGBA,
+                              texFormat);
+
+   pipe_resource_reference(&stObj->pt, res);
+   pipe_sampler_view_reference(&stObj->sampler_view, NULL);
+   pipe_resource_reference(&stImage->pt, res);
+
+   u_sampler_view_default_template(&templ, res, res->format);
+   templ.u.tex.first_layer = index & 1;
+   templ.u.tex.last_layer = index & 1;
+   templ.swizzle_r = GET_SWZ(stObj->base._Swizzle, 0);
+   templ.swizzle_g = GET_SWZ(stObj->base._Swizzle, 1);
+   templ.swizzle_b = GET_SWZ(stObj->base._Swizzle, 2);
+   templ.swizzle_a = GET_SWZ(stObj->base._Swizzle, 3);
+   stObj->sampler_view = st->pipe->create_sampler_view(st->pipe, res, &templ);
+
+   stObj->width0 = res->width0;
+   stObj->height0 = res->height0;
+   stObj->depth0 = 1;
+   stObj->surface_format = res->format;
+
+   _mesa_dirty_texobj(ctx, texObj);
+}
+
+static void
+st_vdpau_unmap_surface(struct gl_context *ctx, GLenum target, GLenum access,
+                       GLboolean output, struct gl_texture_object *texObj,
+                       struct gl_texture_image *texImage,
+                       const GLvoid *vdpSurface, GLuint index)
+{
+   struct st_texture_object *stObj = st_texture_object(texObj);
+   struct st_texture_image *stImage = st_texture_image(texImage);
+
+   pipe_resource_reference(&stObj->pt, NULL);
+   pipe_sampler_view_reference(&stObj->sampler_view, NULL);
+   pipe_resource_reference(&stImage->pt, NULL);
+
+   _mesa_dirty_texobj(ctx, texObj);
+}
+
+void
+st_init_vdpau_functions(struct dd_function_table *functions)
+{
+   functions->VDPAUMapSurface = st_vdpau_map_surface;
+   functions->VDPAUUnmapSurface = st_vdpau_unmap_surface;
+}
diff --git a/mesalib/src/mesa/state_tracker/st_vdpau.h b/mesalib/src/mesa/state_tracker/st_vdpau.h
new file mode 100644
index 000000000..59c744305
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_vdpau.h
@@ -0,0 +1,42 @@
+/**************************************************************************
+ *
+ * Copyright 2013 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, 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 THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ **************************************************************************/
+
+/*
+ * Authors:
+ *      Christian König <christian.koenig@amd.com>
+ *
+ */
+
+#ifndef ST_VDPAU_H
+#define ST_VDPAU_H
+
+struct dd_function_table;
+
+extern void
+st_init_vdpau_functions(struct dd_function_table *functions);
+
+#endif /* ST_VDPAU_H */
diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index fd4b80c48..5dc902054 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -1476,7 +1476,7 @@ DeliverEmulatedMotionEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
         GrabPtr grab;
         XI2Mask *mask;
 
-        if (ti->listeners[0].type != LISTENER_POINTER_REGULAR ||
+        if (ti->listeners[0].type != LISTENER_POINTER_REGULAR &&
             ti->listeners[0].type != LISTENER_POINTER_GRAB)
             return;
 
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 7b4e70fe7..d29f1706a 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -809,7 +809,7 @@ LIBAPPLEWM="applewm >= 1.4"
 LIBDMX="dmx >= 1.0.99.1"
 LIBDRI="dri >= 7.8.0"
 LIBDRM="libdrm >= 2.3.0"
-LIBGL="gl >= 7.1.0"
+LIBGL="gl >= 9.2.0"
 LIBXEXT="xext >= 1.0.99.4"
 LIBXFONT="xfont >= 1.4.2"
 LIBXI="xi >= 1.2.99.1"
@@ -1070,7 +1070,7 @@ if test "x$GLX" = xyes; then
 	AC_SUBST(XLIB_CFLAGS)
 	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
 	GLX_LIBS='$(top_builddir)/glx/libglx.la'
-	GLX_SYS_LIBS="$GLX_SYS_LIBS"
+	GLX_SYS_LIBS="$GLX_SYS_LIBS -lGL"
 else
         GLX=no
 fi
@@ -1080,10 +1080,10 @@ if test "x$GLX" = xno; then
         AIGLX=no
 fi
 
-if test "x$AIGLX" = xyes -a \( "x$DRI" = xyes -o "x$DRI2" = xyes \); then
+if test "x$AIGLX" = xyes -a \( "x$DRI2" = xyes \); then
 	AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
 fi
-AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI" = xyes || test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes)
+AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes)
 
 if test "x$GLX_USE_TLS" = xyes ; then
 	GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
@@ -2238,7 +2238,7 @@ if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then
              ***********************************************])
 fi
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 glx/Makefile
 include/Makefile
@@ -2339,3 +2339,4 @@ test/xi2/Makefile
 xserver.ent
 xorg-server.pc
 ])
+AC_OUTPUT
diff --git a/xorg-server/glx/Makefile.am b/xorg-server/glx/Makefile.am
index d1c203dc9..5f28e87da 100644
--- a/xorg-server/glx/Makefile.am
+++ b/xorg-server/glx/Makefile.am
@@ -26,7 +26,7 @@ if DRI2_AIGLX
 AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/dri2
 endif
 
-glapi_sources =					\
+indirect_sources =				\
 	indirect_dispatch.c			\
 	indirect_dispatch.h			\
 	indirect_dispatch_swap.c		\
@@ -35,22 +35,10 @@ glapi_sources =					\
 	indirect_size.h				\
 	indirect_size_get.c			\
 	indirect_size_get.h			\
-	indirect_table.c			\
-	dispatch.h				\
-	glapitable.h				\
-	glapi.c					\
-	glapi.h					\
-	glapi_gentable.c			\
-	glprocs.h				\
-	glthread.c				\
-	glthread.h
+	indirect_table.c
 
 libglxdri_la_SOURCES =
 
-if DRI
-libglxdri_la_SOURCES += glxdri.c
-endif
-
 if DRI2_AIGLX
 libglxdri_la_SOURCES += glxdri2.c
 endif
@@ -59,7 +47,6 @@ libglxdri_la_LIBADD = $(DLOPEN_LIBS)
 
 libglx_la_SOURCES = \
 	$(indirect_sources) \
-	$(glapi_sources) \
 	clientinfo.c \
 	createcontext.c \
 	extension_string.c \
@@ -82,6 +69,7 @@ libglx_la_SOURCES = \
         glxscreens.c \
         glxscreens.h \
         glxserver.h \
+        glxstubs.c \
         glxutil.h \
         render2.c \
         render2swap.c \
diff --git a/xorg-server/glx/createcontext.c b/xorg-server/glx/createcontext.c
index 13d21ccb9..cbeddec26 100644
--- a/xorg-server/glx/createcontext.c
+++ b/xorg-server/glx/createcontext.c
@@ -68,6 +68,8 @@ validate_render_type(uint32_t render_type)
     switch (render_type) {
     case GLX_RGBA_TYPE:
     case GLX_COLOR_INDEX_TYPE:
+    case GLX_RGBA_FLOAT_TYPE_ARB:
+    case GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT:
         return True;
     default:
         return False;
@@ -320,7 +322,7 @@ __glXDisp_CreateContextAttribsARB(__GLXclientState * cl, GLbyte * pc)
     ctx->id = req->context;
     ctx->share_id = req->shareList;
     ctx->idExists = True;
-    ctx->isCurrent = False;
+    ctx->currentClient = False;
     ctx->isDirect = req->isDirect;
     ctx->hasUnflushedCommands = False;
     ctx->renderMode = GL_RENDER;
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
deleted file mode 100644
index 720865304..000000000
--- a/xorg-server/glx/dispatch.h
+++ /dev/null
@@ -1,19816 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by gl_table.py (from Mesa) script */
-
-/*
- * (C) Copyright IBM Corporation 2005
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#if !defined( _DISPATCH_H_ )
-#define _DISPATCH_H_
-
-/**
- * \file main/dispatch.h
- * Macros for handling GL dispatch tables.
- *
- * For each known GL function, there are 3 macros in this file.  The first
- * macro is named CALL_FuncName and is used to call that GL function using
- * the specified dispatch table.  The other 2 macros, called GET_FuncName
- * can SET_FuncName, are used to get and set the dispatch pointer for the
- * named function in the specified dispatch table.
- */
-
-/* GLXEXT is defined when building the GLX extension in the xserver.
- */
-#if !defined(GLXEXT)
-#include "main/mfeatures.h"
-#endif
-
-#define CALL_by_offset(disp, cast, offset, parameters) \
-    (*(cast (GET_by_offset(disp, offset)))) parameters
-#define GET_by_offset(disp, offset) \
-    (offset >= 0) ? (((_glapi_proc *)(disp))[offset]) : NULL
-#define SET_by_offset(disp, offset, fn) \
-    do { \
-        if ( (offset) < 0 ) { \
-            /* fprintf( stderr, "[%s:%u] SET_by_offset(%p, %d, %s)!\n", */ \
-            /*         __func__, __LINE__, disp, offset, # fn); */ \
-            /* abort(); */ \
-        } \
-        else { \
-            ( (_glapi_proc *) (disp) )[offset] = (_glapi_proc) fn; \
-        } \
-    } while(0)
-
-/* total number of offsets below */
-#define _gloffset_COUNT 973
-
-#define _gloffset_NewList 0
-#define _gloffset_EndList 1
-#define _gloffset_CallList 2
-#define _gloffset_CallLists 3
-#define _gloffset_DeleteLists 4
-#define _gloffset_GenLists 5
-#define _gloffset_ListBase 6
-#define _gloffset_Begin 7
-#define _gloffset_Bitmap 8
-#define _gloffset_Color3b 9
-#define _gloffset_Color3bv 10
-#define _gloffset_Color3d 11
-#define _gloffset_Color3dv 12
-#define _gloffset_Color3f 13
-#define _gloffset_Color3fv 14
-#define _gloffset_Color3i 15
-#define _gloffset_Color3iv 16
-#define _gloffset_Color3s 17
-#define _gloffset_Color3sv 18
-#define _gloffset_Color3ub 19
-#define _gloffset_Color3ubv 20
-#define _gloffset_Color3ui 21
-#define _gloffset_Color3uiv 22
-#define _gloffset_Color3us 23
-#define _gloffset_Color3usv 24
-#define _gloffset_Color4b 25
-#define _gloffset_Color4bv 26
-#define _gloffset_Color4d 27
-#define _gloffset_Color4dv 28
-#define _gloffset_Color4f 29
-#define _gloffset_Color4fv 30
-#define _gloffset_Color4i 31
-#define _gloffset_Color4iv 32
-#define _gloffset_Color4s 33
-#define _gloffset_Color4sv 34
-#define _gloffset_Color4ub 35
-#define _gloffset_Color4ubv 36
-#define _gloffset_Color4ui 37
-#define _gloffset_Color4uiv 38
-#define _gloffset_Color4us 39
-#define _gloffset_Color4usv 40
-#define _gloffset_EdgeFlag 41
-#define _gloffset_EdgeFlagv 42
-#define _gloffset_End 43
-#define _gloffset_Indexd 44
-#define _gloffset_Indexdv 45
-#define _gloffset_Indexf 46
-#define _gloffset_Indexfv 47
-#define _gloffset_Indexi 48
-#define _gloffset_Indexiv 49
-#define _gloffset_Indexs 50
-#define _gloffset_Indexsv 51
-#define _gloffset_Normal3b 52
-#define _gloffset_Normal3bv 53
-#define _gloffset_Normal3d 54
-#define _gloffset_Normal3dv 55
-#define _gloffset_Normal3f 56
-#define _gloffset_Normal3fv 57
-#define _gloffset_Normal3i 58
-#define _gloffset_Normal3iv 59
-#define _gloffset_Normal3s 60
-#define _gloffset_Normal3sv 61
-#define _gloffset_RasterPos2d 62
-#define _gloffset_RasterPos2dv 63
-#define _gloffset_RasterPos2f 64
-#define _gloffset_RasterPos2fv 65
-#define _gloffset_RasterPos2i 66
-#define _gloffset_RasterPos2iv 67
-#define _gloffset_RasterPos2s 68
-#define _gloffset_RasterPos2sv 69
-#define _gloffset_RasterPos3d 70
-#define _gloffset_RasterPos3dv 71
-#define _gloffset_RasterPos3f 72
-#define _gloffset_RasterPos3fv 73
-#define _gloffset_RasterPos3i 74
-#define _gloffset_RasterPos3iv 75
-#define _gloffset_RasterPos3s 76
-#define _gloffset_RasterPos3sv 77
-#define _gloffset_RasterPos4d 78
-#define _gloffset_RasterPos4dv 79
-#define _gloffset_RasterPos4f 80
-#define _gloffset_RasterPos4fv 81
-#define _gloffset_RasterPos4i 82
-#define _gloffset_RasterPos4iv 83
-#define _gloffset_RasterPos4s 84
-#define _gloffset_RasterPos4sv 85
-#define _gloffset_Rectd 86
-#define _gloffset_Rectdv 87
-#define _gloffset_Rectf 88
-#define _gloffset_Rectfv 89
-#define _gloffset_Recti 90
-#define _gloffset_Rectiv 91
-#define _gloffset_Rects 92
-#define _gloffset_Rectsv 93
-#define _gloffset_TexCoord1d 94
-#define _gloffset_TexCoord1dv 95
-#define _gloffset_TexCoord1f 96
-#define _gloffset_TexCoord1fv 97
-#define _gloffset_TexCoord1i 98
-#define _gloffset_TexCoord1iv 99
-#define _gloffset_TexCoord1s 100
-#define _gloffset_TexCoord1sv 101
-#define _gloffset_TexCoord2d 102
-#define _gloffset_TexCoord2dv 103
-#define _gloffset_TexCoord2f 104
-#define _gloffset_TexCoord2fv 105
-#define _gloffset_TexCoord2i 106
-#define _gloffset_TexCoord2iv 107
-#define _gloffset_TexCoord2s 108
-#define _gloffset_TexCoord2sv 109
-#define _gloffset_TexCoord3d 110
-#define _gloffset_TexCoord3dv 111
-#define _gloffset_TexCoord3f 112
-#define _gloffset_TexCoord3fv 113
-#define _gloffset_TexCoord3i 114
-#define _gloffset_TexCoord3iv 115
-#define _gloffset_TexCoord3s 116
-#define _gloffset_TexCoord3sv 117
-#define _gloffset_TexCoord4d 118
-#define _gloffset_TexCoord4dv 119
-#define _gloffset_TexCoord4f 120
-#define _gloffset_TexCoord4fv 121
-#define _gloffset_TexCoord4i 122
-#define _gloffset_TexCoord4iv 123
-#define _gloffset_TexCoord4s 124
-#define _gloffset_TexCoord4sv 125
-#define _gloffset_Vertex2d 126
-#define _gloffset_Vertex2dv 127
-#define _gloffset_Vertex2f 128
-#define _gloffset_Vertex2fv 129
-#define _gloffset_Vertex2i 130
-#define _gloffset_Vertex2iv 131
-#define _gloffset_Vertex2s 132
-#define _gloffset_Vertex2sv 133
-#define _gloffset_Vertex3d 134
-#define _gloffset_Vertex3dv 135
-#define _gloffset_Vertex3f 136
-#define _gloffset_Vertex3fv 137
-#define _gloffset_Vertex3i 138
-#define _gloffset_Vertex3iv 139
-#define _gloffset_Vertex3s 140
-#define _gloffset_Vertex3sv 141
-#define _gloffset_Vertex4d 142
-#define _gloffset_Vertex4dv 143
-#define _gloffset_Vertex4f 144
-#define _gloffset_Vertex4fv 145
-#define _gloffset_Vertex4i 146
-#define _gloffset_Vertex4iv 147
-#define _gloffset_Vertex4s 148
-#define _gloffset_Vertex4sv 149
-#define _gloffset_ClipPlane 150
-#define _gloffset_ColorMaterial 151
-#define _gloffset_CullFace 152
-#define _gloffset_Fogf 153
-#define _gloffset_Fogfv 154
-#define _gloffset_Fogi 155
-#define _gloffset_Fogiv 156
-#define _gloffset_FrontFace 157
-#define _gloffset_Hint 158
-#define _gloffset_Lightf 159
-#define _gloffset_Lightfv 160
-#define _gloffset_Lighti 161
-#define _gloffset_Lightiv 162
-#define _gloffset_LightModelf 163
-#define _gloffset_LightModelfv 164
-#define _gloffset_LightModeli 165
-#define _gloffset_LightModeliv 166
-#define _gloffset_LineStipple 167
-#define _gloffset_LineWidth 168
-#define _gloffset_Materialf 169
-#define _gloffset_Materialfv 170
-#define _gloffset_Materiali 171
-#define _gloffset_Materialiv 172
-#define _gloffset_PointSize 173
-#define _gloffset_PolygonMode 174
-#define _gloffset_PolygonStipple 175
-#define _gloffset_Scissor 176
-#define _gloffset_ShadeModel 177
-#define _gloffset_TexParameterf 178
-#define _gloffset_TexParameterfv 179
-#define _gloffset_TexParameteri 180
-#define _gloffset_TexParameteriv 181
-#define _gloffset_TexImage1D 182
-#define _gloffset_TexImage2D 183
-#define _gloffset_TexEnvf 184
-#define _gloffset_TexEnvfv 185
-#define _gloffset_TexEnvi 186
-#define _gloffset_TexEnviv 187
-#define _gloffset_TexGend 188
-#define _gloffset_TexGendv 189
-#define _gloffset_TexGenf 190
-#define _gloffset_TexGenfv 191
-#define _gloffset_TexGeni 192
-#define _gloffset_TexGeniv 193
-#define _gloffset_FeedbackBuffer 194
-#define _gloffset_SelectBuffer 195
-#define _gloffset_RenderMode 196
-#define _gloffset_InitNames 197
-#define _gloffset_LoadName 198
-#define _gloffset_PassThrough 199
-#define _gloffset_PopName 200
-#define _gloffset_PushName 201
-#define _gloffset_DrawBuffer 202
-#define _gloffset_Clear 203
-#define _gloffset_ClearAccum 204
-#define _gloffset_ClearIndex 205
-#define _gloffset_ClearColor 206
-#define _gloffset_ClearStencil 207
-#define _gloffset_ClearDepth 208
-#define _gloffset_StencilMask 209
-#define _gloffset_ColorMask 210
-#define _gloffset_DepthMask 211
-#define _gloffset_IndexMask 212
-#define _gloffset_Accum 213
-#define _gloffset_Disable 214
-#define _gloffset_Enable 215
-#define _gloffset_Finish 216
-#define _gloffset_Flush 217
-#define _gloffset_PopAttrib 218
-#define _gloffset_PushAttrib 219
-#define _gloffset_Map1d 220
-#define _gloffset_Map1f 221
-#define _gloffset_Map2d 222
-#define _gloffset_Map2f 223
-#define _gloffset_MapGrid1d 224
-#define _gloffset_MapGrid1f 225
-#define _gloffset_MapGrid2d 226
-#define _gloffset_MapGrid2f 227
-#define _gloffset_EvalCoord1d 228
-#define _gloffset_EvalCoord1dv 229
-#define _gloffset_EvalCoord1f 230
-#define _gloffset_EvalCoord1fv 231
-#define _gloffset_EvalCoord2d 232
-#define _gloffset_EvalCoord2dv 233
-#define _gloffset_EvalCoord2f 234
-#define _gloffset_EvalCoord2fv 235
-#define _gloffset_EvalMesh1 236
-#define _gloffset_EvalPoint1 237
-#define _gloffset_EvalMesh2 238
-#define _gloffset_EvalPoint2 239
-#define _gloffset_AlphaFunc 240
-#define _gloffset_BlendFunc 241
-#define _gloffset_LogicOp 242
-#define _gloffset_StencilFunc 243
-#define _gloffset_StencilOp 244
-#define _gloffset_DepthFunc 245
-#define _gloffset_PixelZoom 246
-#define _gloffset_PixelTransferf 247
-#define _gloffset_PixelTransferi 248
-#define _gloffset_PixelStoref 249
-#define _gloffset_PixelStorei 250
-#define _gloffset_PixelMapfv 251
-#define _gloffset_PixelMapuiv 252
-#define _gloffset_PixelMapusv 253
-#define _gloffset_ReadBuffer 254
-#define _gloffset_CopyPixels 255
-#define _gloffset_ReadPixels 256
-#define _gloffset_DrawPixels 257
-#define _gloffset_GetBooleanv 258
-#define _gloffset_GetClipPlane 259
-#define _gloffset_GetDoublev 260
-#define _gloffset_GetError 261
-#define _gloffset_GetFloatv 262
-#define _gloffset_GetIntegerv 263
-#define _gloffset_GetLightfv 264
-#define _gloffset_GetLightiv 265
-#define _gloffset_GetMapdv 266
-#define _gloffset_GetMapfv 267
-#define _gloffset_GetMapiv 268
-#define _gloffset_GetMaterialfv 269
-#define _gloffset_GetMaterialiv 270
-#define _gloffset_GetPixelMapfv 271
-#define _gloffset_GetPixelMapuiv 272
-#define _gloffset_GetPixelMapusv 273
-#define _gloffset_GetPolygonStipple 274
-#define _gloffset_GetString 275
-#define _gloffset_GetTexEnvfv 276
-#define _gloffset_GetTexEnviv 277
-#define _gloffset_GetTexGendv 278
-#define _gloffset_GetTexGenfv 279
-#define _gloffset_GetTexGeniv 280
-#define _gloffset_GetTexImage 281
-#define _gloffset_GetTexParameterfv 282
-#define _gloffset_GetTexParameteriv 283
-#define _gloffset_GetTexLevelParameterfv 284
-#define _gloffset_GetTexLevelParameteriv 285
-#define _gloffset_IsEnabled 286
-#define _gloffset_IsList 287
-#define _gloffset_DepthRange 288
-#define _gloffset_Frustum 289
-#define _gloffset_LoadIdentity 290
-#define _gloffset_LoadMatrixf 291
-#define _gloffset_LoadMatrixd 292
-#define _gloffset_MatrixMode 293
-#define _gloffset_MultMatrixf 294
-#define _gloffset_MultMatrixd 295
-#define _gloffset_Ortho 296
-#define _gloffset_PopMatrix 297
-#define _gloffset_PushMatrix 298
-#define _gloffset_Rotated 299
-#define _gloffset_Rotatef 300
-#define _gloffset_Scaled 301
-#define _gloffset_Scalef 302
-#define _gloffset_Translated 303
-#define _gloffset_Translatef 304
-#define _gloffset_Viewport 305
-#define _gloffset_ArrayElement 306
-#define _gloffset_BindTexture 307
-#define _gloffset_ColorPointer 308
-#define _gloffset_DisableClientState 309
-#define _gloffset_DrawArrays 310
-#define _gloffset_DrawElements 311
-#define _gloffset_EdgeFlagPointer 312
-#define _gloffset_EnableClientState 313
-#define _gloffset_IndexPointer 314
-#define _gloffset_Indexub 315
-#define _gloffset_Indexubv 316
-#define _gloffset_InterleavedArrays 317
-#define _gloffset_NormalPointer 318
-#define _gloffset_PolygonOffset 319
-#define _gloffset_TexCoordPointer 320
-#define _gloffset_VertexPointer 321
-#define _gloffset_AreTexturesResident 322
-#define _gloffset_CopyTexImage1D 323
-#define _gloffset_CopyTexImage2D 324
-#define _gloffset_CopyTexSubImage1D 325
-#define _gloffset_CopyTexSubImage2D 326
-#define _gloffset_DeleteTextures 327
-#define _gloffset_GenTextures 328
-#define _gloffset_GetPointerv 329
-#define _gloffset_IsTexture 330
-#define _gloffset_PrioritizeTextures 331
-#define _gloffset_TexSubImage1D 332
-#define _gloffset_TexSubImage2D 333
-#define _gloffset_PopClientAttrib 334
-#define _gloffset_PushClientAttrib 335
-#define _gloffset_BlendColor 336
-#define _gloffset_BlendEquation 337
-#define _gloffset_DrawRangeElements 338
-#define _gloffset_ColorTable 339
-#define _gloffset_ColorTableParameterfv 340
-#define _gloffset_ColorTableParameteriv 341
-#define _gloffset_CopyColorTable 342
-#define _gloffset_GetColorTable 343
-#define _gloffset_GetColorTableParameterfv 344
-#define _gloffset_GetColorTableParameteriv 345
-#define _gloffset_ColorSubTable 346
-#define _gloffset_CopyColorSubTable 347
-#define _gloffset_ConvolutionFilter1D 348
-#define _gloffset_ConvolutionFilter2D 349
-#define _gloffset_ConvolutionParameterf 350
-#define _gloffset_ConvolutionParameterfv 351
-#define _gloffset_ConvolutionParameteri 352
-#define _gloffset_ConvolutionParameteriv 353
-#define _gloffset_CopyConvolutionFilter1D 354
-#define _gloffset_CopyConvolutionFilter2D 355
-#define _gloffset_GetConvolutionFilter 356
-#define _gloffset_GetConvolutionParameterfv 357
-#define _gloffset_GetConvolutionParameteriv 358
-#define _gloffset_GetSeparableFilter 359
-#define _gloffset_SeparableFilter2D 360
-#define _gloffset_GetHistogram 361
-#define _gloffset_GetHistogramParameterfv 362
-#define _gloffset_GetHistogramParameteriv 363
-#define _gloffset_GetMinmax 364
-#define _gloffset_GetMinmaxParameterfv 365
-#define _gloffset_GetMinmaxParameteriv 366
-#define _gloffset_Histogram 367
-#define _gloffset_Minmax 368
-#define _gloffset_ResetHistogram 369
-#define _gloffset_ResetMinmax 370
-#define _gloffset_TexImage3D 371
-#define _gloffset_TexSubImage3D 372
-#define _gloffset_CopyTexSubImage3D 373
-#define _gloffset_ActiveTextureARB 374
-#define _gloffset_ClientActiveTextureARB 375
-#define _gloffset_MultiTexCoord1dARB 376
-#define _gloffset_MultiTexCoord1dvARB 377
-#define _gloffset_MultiTexCoord1fARB 378
-#define _gloffset_MultiTexCoord1fvARB 379
-#define _gloffset_MultiTexCoord1iARB 380
-#define _gloffset_MultiTexCoord1ivARB 381
-#define _gloffset_MultiTexCoord1sARB 382
-#define _gloffset_MultiTexCoord1svARB 383
-#define _gloffset_MultiTexCoord2dARB 384
-#define _gloffset_MultiTexCoord2dvARB 385
-#define _gloffset_MultiTexCoord2fARB 386
-#define _gloffset_MultiTexCoord2fvARB 387
-#define _gloffset_MultiTexCoord2iARB 388
-#define _gloffset_MultiTexCoord2ivARB 389
-#define _gloffset_MultiTexCoord2sARB 390
-#define _gloffset_MultiTexCoord2svARB 391
-#define _gloffset_MultiTexCoord3dARB 392
-#define _gloffset_MultiTexCoord3dvARB 393
-#define _gloffset_MultiTexCoord3fARB 394
-#define _gloffset_MultiTexCoord3fvARB 395
-#define _gloffset_MultiTexCoord3iARB 396
-#define _gloffset_MultiTexCoord3ivARB 397
-#define _gloffset_MultiTexCoord3sARB 398
-#define _gloffset_MultiTexCoord3svARB 399
-#define _gloffset_MultiTexCoord4dARB 400
-#define _gloffset_MultiTexCoord4dvARB 401
-#define _gloffset_MultiTexCoord4fARB 402
-#define _gloffset_MultiTexCoord4fvARB 403
-#define _gloffset_MultiTexCoord4iARB 404
-#define _gloffset_MultiTexCoord4ivARB 405
-#define _gloffset_MultiTexCoord4sARB 406
-#define _gloffset_MultiTexCoord4svARB 407
-
-#if !FEATURE_remap_table
-
-#define _gloffset_AttachShader 408
-#define _gloffset_CreateProgram 409
-#define _gloffset_CreateShader 410
-#define _gloffset_DeleteProgram 411
-#define _gloffset_DeleteShader 412
-#define _gloffset_DetachShader 413
-#define _gloffset_GetAttachedShaders 414
-#define _gloffset_GetProgramInfoLog 415
-#define _gloffset_GetProgramiv 416
-#define _gloffset_GetShaderInfoLog 417
-#define _gloffset_GetShaderiv 418
-#define _gloffset_IsProgram 419
-#define _gloffset_IsShader 420
-#define _gloffset_StencilFuncSeparate 421
-#define _gloffset_StencilMaskSeparate 422
-#define _gloffset_StencilOpSeparate 423
-#define _gloffset_UniformMatrix2x3fv 424
-#define _gloffset_UniformMatrix2x4fv 425
-#define _gloffset_UniformMatrix3x2fv 426
-#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_TexBuffer 436
-#define _gloffset_FramebufferTexture 437
-#define _gloffset_GetBufferParameteri64v 438
-#define _gloffset_GetInteger64i_v 439
-#define _gloffset_VertexAttribDivisor 440
-#define _gloffset_LoadTransposeMatrixdARB 441
-#define _gloffset_LoadTransposeMatrixfARB 442
-#define _gloffset_MultTransposeMatrixdARB 443
-#define _gloffset_MultTransposeMatrixfARB 444
-#define _gloffset_SampleCoverageARB 445
-#define _gloffset_CompressedTexImage1DARB 446
-#define _gloffset_CompressedTexImage2DARB 447
-#define _gloffset_CompressedTexImage3DARB 448
-#define _gloffset_CompressedTexSubImage1DARB 449
-#define _gloffset_CompressedTexSubImage2DARB 450
-#define _gloffset_CompressedTexSubImage3DARB 451
-#define _gloffset_GetCompressedTexImageARB 452
-#define _gloffset_DisableVertexAttribArrayARB 453
-#define _gloffset_EnableVertexAttribArrayARB 454
-#define _gloffset_GetProgramEnvParameterdvARB 455
-#define _gloffset_GetProgramEnvParameterfvARB 456
-#define _gloffset_GetProgramLocalParameterdvARB 457
-#define _gloffset_GetProgramLocalParameterfvARB 458
-#define _gloffset_GetProgramStringARB 459
-#define _gloffset_GetProgramivARB 460
-#define _gloffset_GetVertexAttribdvARB 461
-#define _gloffset_GetVertexAttribfvARB 462
-#define _gloffset_GetVertexAttribivARB 463
-#define _gloffset_ProgramEnvParameter4dARB 464
-#define _gloffset_ProgramEnvParameter4dvARB 465
-#define _gloffset_ProgramEnvParameter4fARB 466
-#define _gloffset_ProgramEnvParameter4fvARB 467
-#define _gloffset_ProgramLocalParameter4dARB 468
-#define _gloffset_ProgramLocalParameter4dvARB 469
-#define _gloffset_ProgramLocalParameter4fARB 470
-#define _gloffset_ProgramLocalParameter4fvARB 471
-#define _gloffset_ProgramStringARB 472
-#define _gloffset_VertexAttrib1dARB 473
-#define _gloffset_VertexAttrib1dvARB 474
-#define _gloffset_VertexAttrib1fARB 475
-#define _gloffset_VertexAttrib1fvARB 476
-#define _gloffset_VertexAttrib1sARB 477
-#define _gloffset_VertexAttrib1svARB 478
-#define _gloffset_VertexAttrib2dARB 479
-#define _gloffset_VertexAttrib2dvARB 480
-#define _gloffset_VertexAttrib2fARB 481
-#define _gloffset_VertexAttrib2fvARB 482
-#define _gloffset_VertexAttrib2sARB 483
-#define _gloffset_VertexAttrib2svARB 484
-#define _gloffset_VertexAttrib3dARB 485
-#define _gloffset_VertexAttrib3dvARB 486
-#define _gloffset_VertexAttrib3fARB 487
-#define _gloffset_VertexAttrib3fvARB 488
-#define _gloffset_VertexAttrib3sARB 489
-#define _gloffset_VertexAttrib3svARB 490
-#define _gloffset_VertexAttrib4NbvARB 491
-#define _gloffset_VertexAttrib4NivARB 492
-#define _gloffset_VertexAttrib4NsvARB 493
-#define _gloffset_VertexAttrib4NubARB 494
-#define _gloffset_VertexAttrib4NubvARB 495
-#define _gloffset_VertexAttrib4NuivARB 496
-#define _gloffset_VertexAttrib4NusvARB 497
-#define _gloffset_VertexAttrib4bvARB 498
-#define _gloffset_VertexAttrib4dARB 499
-#define _gloffset_VertexAttrib4dvARB 500
-#define _gloffset_VertexAttrib4fARB 501
-#define _gloffset_VertexAttrib4fvARB 502
-#define _gloffset_VertexAttrib4ivARB 503
-#define _gloffset_VertexAttrib4sARB 504
-#define _gloffset_VertexAttrib4svARB 505
-#define _gloffset_VertexAttrib4ubvARB 506
-#define _gloffset_VertexAttrib4uivARB 507
-#define _gloffset_VertexAttrib4usvARB 508
-#define _gloffset_VertexAttribPointerARB 509
-#define _gloffset_BindBufferARB 510
-#define _gloffset_BufferDataARB 511
-#define _gloffset_BufferSubDataARB 512
-#define _gloffset_DeleteBuffersARB 513
-#define _gloffset_GenBuffersARB 514
-#define _gloffset_GetBufferParameterivARB 515
-#define _gloffset_GetBufferPointervARB 516
-#define _gloffset_GetBufferSubDataARB 517
-#define _gloffset_IsBufferARB 518
-#define _gloffset_MapBufferARB 519
-#define _gloffset_UnmapBufferARB 520
-#define _gloffset_BeginQueryARB 521
-#define _gloffset_DeleteQueriesARB 522
-#define _gloffset_EndQueryARB 523
-#define _gloffset_GenQueriesARB 524
-#define _gloffset_GetQueryObjectivARB 525
-#define _gloffset_GetQueryObjectuivARB 526
-#define _gloffset_GetQueryivARB 527
-#define _gloffset_IsQueryARB 528
-#define _gloffset_AttachObjectARB 529
-#define _gloffset_CompileShaderARB 530
-#define _gloffset_CreateProgramObjectARB 531
-#define _gloffset_CreateShaderObjectARB 532
-#define _gloffset_DeleteObjectARB 533
-#define _gloffset_DetachObjectARB 534
-#define _gloffset_GetActiveUniformARB 535
-#define _gloffset_GetAttachedObjectsARB 536
-#define _gloffset_GetHandleARB 537
-#define _gloffset_GetInfoLogARB 538
-#define _gloffset_GetObjectParameterfvARB 539
-#define _gloffset_GetObjectParameterivARB 540
-#define _gloffset_GetShaderSourceARB 541
-#define _gloffset_GetUniformLocationARB 542
-#define _gloffset_GetUniformfvARB 543
-#define _gloffset_GetUniformivARB 544
-#define _gloffset_LinkProgramARB 545
-#define _gloffset_ShaderSourceARB 546
-#define _gloffset_Uniform1fARB 547
-#define _gloffset_Uniform1fvARB 548
-#define _gloffset_Uniform1iARB 549
-#define _gloffset_Uniform1ivARB 550
-#define _gloffset_Uniform2fARB 551
-#define _gloffset_Uniform2fvARB 552
-#define _gloffset_Uniform2iARB 553
-#define _gloffset_Uniform2ivARB 554
-#define _gloffset_Uniform3fARB 555
-#define _gloffset_Uniform3fvARB 556
-#define _gloffset_Uniform3iARB 557
-#define _gloffset_Uniform3ivARB 558
-#define _gloffset_Uniform4fARB 559
-#define _gloffset_Uniform4fvARB 560
-#define _gloffset_Uniform4iARB 561
-#define _gloffset_Uniform4ivARB 562
-#define _gloffset_UniformMatrix2fvARB 563
-#define _gloffset_UniformMatrix3fvARB 564
-#define _gloffset_UniformMatrix4fvARB 565
-#define _gloffset_UseProgramObjectARB 566
-#define _gloffset_ValidateProgramARB 567
-#define _gloffset_BindAttribLocationARB 568
-#define _gloffset_GetActiveAttribARB 569
-#define _gloffset_GetAttribLocationARB 570
-#define _gloffset_DrawBuffersARB 571
-#define _gloffset_ClampColorARB 572
-#define _gloffset_DrawArraysInstancedARB 573
-#define _gloffset_DrawElementsInstancedARB 574
-#define _gloffset_RenderbufferStorageMultisample 575
-#define _gloffset_FramebufferTextureARB 576
-#define _gloffset_FramebufferTextureFaceARB 577
-#define _gloffset_ProgramParameteriARB 578
-#define _gloffset_VertexAttribDivisorARB 579
-#define _gloffset_FlushMappedBufferRange 580
-#define _gloffset_MapBufferRange 581
-#define _gloffset_TexBufferARB 582
-#define _gloffset_BindVertexArray 583
-#define _gloffset_GenVertexArrays 584
-#define _gloffset_CopyBufferSubData 585
-#define _gloffset_ClientWaitSync 586
-#define _gloffset_DeleteSync 587
-#define _gloffset_FenceSync 588
-#define _gloffset_GetInteger64v 589
-#define _gloffset_GetSynciv 590
-#define _gloffset_IsSync 591
-#define _gloffset_WaitSync 592
-#define _gloffset_DrawElementsBaseVertex 593
-#define _gloffset_DrawElementsInstancedBaseVertex 594
-#define _gloffset_DrawRangeElementsBaseVertex 595
-#define _gloffset_MultiDrawElementsBaseVertex 596
-#define _gloffset_BlendEquationSeparateiARB 597
-#define _gloffset_BlendEquationiARB 598
-#define _gloffset_BlendFuncSeparateiARB 599
-#define _gloffset_BlendFunciARB 600
-#define _gloffset_BindSampler 601
-#define _gloffset_DeleteSamplers 602
-#define _gloffset_GenSamplers 603
-#define _gloffset_GetSamplerParameterIiv 604
-#define _gloffset_GetSamplerParameterIuiv 605
-#define _gloffset_GetSamplerParameterfv 606
-#define _gloffset_GetSamplerParameteriv 607
-#define _gloffset_IsSampler 608
-#define _gloffset_SamplerParameterIiv 609
-#define _gloffset_SamplerParameterIuiv 610
-#define _gloffset_SamplerParameterf 611
-#define _gloffset_SamplerParameterfv 612
-#define _gloffset_SamplerParameteri 613
-#define _gloffset_SamplerParameteriv 614
-#define _gloffset_ColorP3ui 615
-#define _gloffset_ColorP3uiv 616
-#define _gloffset_ColorP4ui 617
-#define _gloffset_ColorP4uiv 618
-#define _gloffset_MultiTexCoordP1ui 619
-#define _gloffset_MultiTexCoordP1uiv 620
-#define _gloffset_MultiTexCoordP2ui 621
-#define _gloffset_MultiTexCoordP2uiv 622
-#define _gloffset_MultiTexCoordP3ui 623
-#define _gloffset_MultiTexCoordP3uiv 624
-#define _gloffset_MultiTexCoordP4ui 625
-#define _gloffset_MultiTexCoordP4uiv 626
-#define _gloffset_NormalP3ui 627
-#define _gloffset_NormalP3uiv 628
-#define _gloffset_SecondaryColorP3ui 629
-#define _gloffset_SecondaryColorP3uiv 630
-#define _gloffset_TexCoordP1ui 631
-#define _gloffset_TexCoordP1uiv 632
-#define _gloffset_TexCoordP2ui 633
-#define _gloffset_TexCoordP2uiv 634
-#define _gloffset_TexCoordP3ui 635
-#define _gloffset_TexCoordP3uiv 636
-#define _gloffset_TexCoordP4ui 637
-#define _gloffset_TexCoordP4uiv 638
-#define _gloffset_VertexAttribP1ui 639
-#define _gloffset_VertexAttribP1uiv 640
-#define _gloffset_VertexAttribP2ui 641
-#define _gloffset_VertexAttribP2uiv 642
-#define _gloffset_VertexAttribP3ui 643
-#define _gloffset_VertexAttribP3uiv 644
-#define _gloffset_VertexAttribP4ui 645
-#define _gloffset_VertexAttribP4uiv 646
-#define _gloffset_VertexP2ui 647
-#define _gloffset_VertexP2uiv 648
-#define _gloffset_VertexP3ui 649
-#define _gloffset_VertexP3uiv 650
-#define _gloffset_VertexP4ui 651
-#define _gloffset_VertexP4uiv 652
-#define _gloffset_BindTransformFeedback 653
-#define _gloffset_DeleteTransformFeedbacks 654
-#define _gloffset_DrawTransformFeedback 655
-#define _gloffset_GenTransformFeedbacks 656
-#define _gloffset_IsTransformFeedback 657
-#define _gloffset_PauseTransformFeedback 658
-#define _gloffset_ResumeTransformFeedback 659
-#define _gloffset_ClearDepthf 660
-#define _gloffset_DepthRangef 661
-#define _gloffset_GetShaderPrecisionFormat 662
-#define _gloffset_ReleaseShaderCompiler 663
-#define _gloffset_ShaderBinary 664
-#define _gloffset_GetGraphicsResetStatusARB 665
-#define _gloffset_GetnColorTableARB 666
-#define _gloffset_GetnCompressedTexImageARB 667
-#define _gloffset_GetnConvolutionFilterARB 668
-#define _gloffset_GetnHistogramARB 669
-#define _gloffset_GetnMapdvARB 670
-#define _gloffset_GetnMapfvARB 671
-#define _gloffset_GetnMapivARB 672
-#define _gloffset_GetnMinmaxARB 673
-#define _gloffset_GetnPixelMapfvARB 674
-#define _gloffset_GetnPixelMapuivARB 675
-#define _gloffset_GetnPixelMapusvARB 676
-#define _gloffset_GetnPolygonStippleARB 677
-#define _gloffset_GetnSeparableFilterARB 678
-#define _gloffset_GetnTexImageARB 679
-#define _gloffset_GetnUniformdvARB 680
-#define _gloffset_GetnUniformfvARB 681
-#define _gloffset_GetnUniformivARB 682
-#define _gloffset_GetnUniformuivARB 683
-#define _gloffset_ReadnPixelsARB 684
-#define _gloffset_TexStorage1D 685
-#define _gloffset_TexStorage2D 686
-#define _gloffset_TexStorage3D 687
-#define _gloffset_TextureStorage1DEXT 688
-#define _gloffset_TextureStorage2DEXT 689
-#define _gloffset_TextureStorage3DEXT 690
-#define _gloffset_PolygonOffsetEXT 691
-#define _gloffset_GetPixelTexGenParameterfvSGIS 692
-#define _gloffset_GetPixelTexGenParameterivSGIS 693
-#define _gloffset_PixelTexGenParameterfSGIS 694
-#define _gloffset_PixelTexGenParameterfvSGIS 695
-#define _gloffset_PixelTexGenParameteriSGIS 696
-#define _gloffset_PixelTexGenParameterivSGIS 697
-#define _gloffset_SampleMaskSGIS 698
-#define _gloffset_SamplePatternSGIS 699
-#define _gloffset_ColorPointerEXT 700
-#define _gloffset_EdgeFlagPointerEXT 701
-#define _gloffset_IndexPointerEXT 702
-#define _gloffset_NormalPointerEXT 703
-#define _gloffset_TexCoordPointerEXT 704
-#define _gloffset_VertexPointerEXT 705
-#define _gloffset_PointParameterfEXT 706
-#define _gloffset_PointParameterfvEXT 707
-#define _gloffset_LockArraysEXT 708
-#define _gloffset_UnlockArraysEXT 709
-#define _gloffset_SecondaryColor3bEXT 710
-#define _gloffset_SecondaryColor3bvEXT 711
-#define _gloffset_SecondaryColor3dEXT 712
-#define _gloffset_SecondaryColor3dvEXT 713
-#define _gloffset_SecondaryColor3fEXT 714
-#define _gloffset_SecondaryColor3fvEXT 715
-#define _gloffset_SecondaryColor3iEXT 716
-#define _gloffset_SecondaryColor3ivEXT 717
-#define _gloffset_SecondaryColor3sEXT 718
-#define _gloffset_SecondaryColor3svEXT 719
-#define _gloffset_SecondaryColor3ubEXT 720
-#define _gloffset_SecondaryColor3ubvEXT 721
-#define _gloffset_SecondaryColor3uiEXT 722
-#define _gloffset_SecondaryColor3uivEXT 723
-#define _gloffset_SecondaryColor3usEXT 724
-#define _gloffset_SecondaryColor3usvEXT 725
-#define _gloffset_SecondaryColorPointerEXT 726
-#define _gloffset_MultiDrawArraysEXT 727
-#define _gloffset_MultiDrawElementsEXT 728
-#define _gloffset_FogCoordPointerEXT 729
-#define _gloffset_FogCoorddEXT 730
-#define _gloffset_FogCoorddvEXT 731
-#define _gloffset_FogCoordfEXT 732
-#define _gloffset_FogCoordfvEXT 733
-#define _gloffset_PixelTexGenSGIX 734
-#define _gloffset_BlendFuncSeparateEXT 735
-#define _gloffset_FlushVertexArrayRangeNV 736
-#define _gloffset_VertexArrayRangeNV 737
-#define _gloffset_CombinerInputNV 738
-#define _gloffset_CombinerOutputNV 739
-#define _gloffset_CombinerParameterfNV 740
-#define _gloffset_CombinerParameterfvNV 741
-#define _gloffset_CombinerParameteriNV 742
-#define _gloffset_CombinerParameterivNV 743
-#define _gloffset_FinalCombinerInputNV 744
-#define _gloffset_GetCombinerInputParameterfvNV 745
-#define _gloffset_GetCombinerInputParameterivNV 746
-#define _gloffset_GetCombinerOutputParameterfvNV 747
-#define _gloffset_GetCombinerOutputParameterivNV 748
-#define _gloffset_GetFinalCombinerInputParameterfvNV 749
-#define _gloffset_GetFinalCombinerInputParameterivNV 750
-#define _gloffset_ResizeBuffersMESA 751
-#define _gloffset_WindowPos2dMESA 752
-#define _gloffset_WindowPos2dvMESA 753
-#define _gloffset_WindowPos2fMESA 754
-#define _gloffset_WindowPos2fvMESA 755
-#define _gloffset_WindowPos2iMESA 756
-#define _gloffset_WindowPos2ivMESA 757
-#define _gloffset_WindowPos2sMESA 758
-#define _gloffset_WindowPos2svMESA 759
-#define _gloffset_WindowPos3dMESA 760
-#define _gloffset_WindowPos3dvMESA 761
-#define _gloffset_WindowPos3fMESA 762
-#define _gloffset_WindowPos3fvMESA 763
-#define _gloffset_WindowPos3iMESA 764
-#define _gloffset_WindowPos3ivMESA 765
-#define _gloffset_WindowPos3sMESA 766
-#define _gloffset_WindowPos3svMESA 767
-#define _gloffset_WindowPos4dMESA 768
-#define _gloffset_WindowPos4dvMESA 769
-#define _gloffset_WindowPos4fMESA 770
-#define _gloffset_WindowPos4fvMESA 771
-#define _gloffset_WindowPos4iMESA 772
-#define _gloffset_WindowPos4ivMESA 773
-#define _gloffset_WindowPos4sMESA 774
-#define _gloffset_WindowPos4svMESA 775
-#define _gloffset_MultiModeDrawArraysIBM 776
-#define _gloffset_MultiModeDrawElementsIBM 777
-#define _gloffset_DeleteFencesNV 778
-#define _gloffset_FinishFenceNV 779
-#define _gloffset_GenFencesNV 780
-#define _gloffset_GetFenceivNV 781
-#define _gloffset_IsFenceNV 782
-#define _gloffset_SetFenceNV 783
-#define _gloffset_TestFenceNV 784
-#define _gloffset_AreProgramsResidentNV 785
-#define _gloffset_BindProgramNV 786
-#define _gloffset_DeleteProgramsNV 787
-#define _gloffset_ExecuteProgramNV 788
-#define _gloffset_GenProgramsNV 789
-#define _gloffset_GetProgramParameterdvNV 790
-#define _gloffset_GetProgramParameterfvNV 791
-#define _gloffset_GetProgramStringNV 792
-#define _gloffset_GetProgramivNV 793
-#define _gloffset_GetTrackMatrixivNV 794
-#define _gloffset_GetVertexAttribPointervNV 795
-#define _gloffset_GetVertexAttribdvNV 796
-#define _gloffset_GetVertexAttribfvNV 797
-#define _gloffset_GetVertexAttribivNV 798
-#define _gloffset_IsProgramNV 799
-#define _gloffset_LoadProgramNV 800
-#define _gloffset_ProgramParameters4dvNV 801
-#define _gloffset_ProgramParameters4fvNV 802
-#define _gloffset_RequestResidentProgramsNV 803
-#define _gloffset_TrackMatrixNV 804
-#define _gloffset_VertexAttrib1dNV 805
-#define _gloffset_VertexAttrib1dvNV 806
-#define _gloffset_VertexAttrib1fNV 807
-#define _gloffset_VertexAttrib1fvNV 808
-#define _gloffset_VertexAttrib1sNV 809
-#define _gloffset_VertexAttrib1svNV 810
-#define _gloffset_VertexAttrib2dNV 811
-#define _gloffset_VertexAttrib2dvNV 812
-#define _gloffset_VertexAttrib2fNV 813
-#define _gloffset_VertexAttrib2fvNV 814
-#define _gloffset_VertexAttrib2sNV 815
-#define _gloffset_VertexAttrib2svNV 816
-#define _gloffset_VertexAttrib3dNV 817
-#define _gloffset_VertexAttrib3dvNV 818
-#define _gloffset_VertexAttrib3fNV 819
-#define _gloffset_VertexAttrib3fvNV 820
-#define _gloffset_VertexAttrib3sNV 821
-#define _gloffset_VertexAttrib3svNV 822
-#define _gloffset_VertexAttrib4dNV 823
-#define _gloffset_VertexAttrib4dvNV 824
-#define _gloffset_VertexAttrib4fNV 825
-#define _gloffset_VertexAttrib4fvNV 826
-#define _gloffset_VertexAttrib4sNV 827
-#define _gloffset_VertexAttrib4svNV 828
-#define _gloffset_VertexAttrib4ubNV 829
-#define _gloffset_VertexAttrib4ubvNV 830
-#define _gloffset_VertexAttribPointerNV 831
-#define _gloffset_VertexAttribs1dvNV 832
-#define _gloffset_VertexAttribs1fvNV 833
-#define _gloffset_VertexAttribs1svNV 834
-#define _gloffset_VertexAttribs2dvNV 835
-#define _gloffset_VertexAttribs2fvNV 836
-#define _gloffset_VertexAttribs2svNV 837
-#define _gloffset_VertexAttribs3dvNV 838
-#define _gloffset_VertexAttribs3fvNV 839
-#define _gloffset_VertexAttribs3svNV 840
-#define _gloffset_VertexAttribs4dvNV 841
-#define _gloffset_VertexAttribs4fvNV 842
-#define _gloffset_VertexAttribs4svNV 843
-#define _gloffset_VertexAttribs4ubvNV 844
-#define _gloffset_GetTexBumpParameterfvATI 845
-#define _gloffset_GetTexBumpParameterivATI 846
-#define _gloffset_TexBumpParameterfvATI 847
-#define _gloffset_TexBumpParameterivATI 848
-#define _gloffset_AlphaFragmentOp1ATI 849
-#define _gloffset_AlphaFragmentOp2ATI 850
-#define _gloffset_AlphaFragmentOp3ATI 851
-#define _gloffset_BeginFragmentShaderATI 852
-#define _gloffset_BindFragmentShaderATI 853
-#define _gloffset_ColorFragmentOp1ATI 854
-#define _gloffset_ColorFragmentOp2ATI 855
-#define _gloffset_ColorFragmentOp3ATI 856
-#define _gloffset_DeleteFragmentShaderATI 857
-#define _gloffset_EndFragmentShaderATI 858
-#define _gloffset_GenFragmentShadersATI 859
-#define _gloffset_PassTexCoordATI 860
-#define _gloffset_SampleMapATI 861
-#define _gloffset_SetFragmentShaderConstantATI 862
-#define _gloffset_PointParameteriNV 863
-#define _gloffset_PointParameterivNV 864
-#define _gloffset_ActiveStencilFaceEXT 865
-#define _gloffset_BindVertexArrayAPPLE 866
-#define _gloffset_DeleteVertexArraysAPPLE 867
-#define _gloffset_GenVertexArraysAPPLE 868
-#define _gloffset_IsVertexArrayAPPLE 869
-#define _gloffset_GetProgramNamedParameterdvNV 870
-#define _gloffset_GetProgramNamedParameterfvNV 871
-#define _gloffset_ProgramNamedParameter4dNV 872
-#define _gloffset_ProgramNamedParameter4dvNV 873
-#define _gloffset_ProgramNamedParameter4fNV 874
-#define _gloffset_ProgramNamedParameter4fvNV 875
-#define _gloffset_PrimitiveRestartIndexNV 876
-#define _gloffset_PrimitiveRestartNV 877
-#define _gloffset_DepthBoundsEXT 878
-#define _gloffset_BlendEquationSeparateEXT 879
-#define _gloffset_BindFramebufferEXT 880
-#define _gloffset_BindRenderbufferEXT 881
-#define _gloffset_CheckFramebufferStatusEXT 882
-#define _gloffset_DeleteFramebuffersEXT 883
-#define _gloffset_DeleteRenderbuffersEXT 884
-#define _gloffset_FramebufferRenderbufferEXT 885
-#define _gloffset_FramebufferTexture1DEXT 886
-#define _gloffset_FramebufferTexture2DEXT 887
-#define _gloffset_FramebufferTexture3DEXT 888
-#define _gloffset_GenFramebuffersEXT 889
-#define _gloffset_GenRenderbuffersEXT 890
-#define _gloffset_GenerateMipmapEXT 891
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 892
-#define _gloffset_GetRenderbufferParameterivEXT 893
-#define _gloffset_IsFramebufferEXT 894
-#define _gloffset_IsRenderbufferEXT 895
-#define _gloffset_RenderbufferStorageEXT 896
-#define _gloffset_BlitFramebufferEXT 897
-#define _gloffset_BufferParameteriAPPLE 898
-#define _gloffset_FlushMappedBufferRangeAPPLE 899
-#define _gloffset_BindFragDataLocationEXT 900
-#define _gloffset_GetFragDataLocationEXT 901
-#define _gloffset_GetUniformuivEXT 902
-#define _gloffset_GetVertexAttribIivEXT 903
-#define _gloffset_GetVertexAttribIuivEXT 904
-#define _gloffset_Uniform1uiEXT 905
-#define _gloffset_Uniform1uivEXT 906
-#define _gloffset_Uniform2uiEXT 907
-#define _gloffset_Uniform2uivEXT 908
-#define _gloffset_Uniform3uiEXT 909
-#define _gloffset_Uniform3uivEXT 910
-#define _gloffset_Uniform4uiEXT 911
-#define _gloffset_Uniform4uivEXT 912
-#define _gloffset_VertexAttribI1iEXT 913
-#define _gloffset_VertexAttribI1ivEXT 914
-#define _gloffset_VertexAttribI1uiEXT 915
-#define _gloffset_VertexAttribI1uivEXT 916
-#define _gloffset_VertexAttribI2iEXT 917
-#define _gloffset_VertexAttribI2ivEXT 918
-#define _gloffset_VertexAttribI2uiEXT 919
-#define _gloffset_VertexAttribI2uivEXT 920
-#define _gloffset_VertexAttribI3iEXT 921
-#define _gloffset_VertexAttribI3ivEXT 922
-#define _gloffset_VertexAttribI3uiEXT 923
-#define _gloffset_VertexAttribI3uivEXT 924
-#define _gloffset_VertexAttribI4bvEXT 925
-#define _gloffset_VertexAttribI4iEXT 926
-#define _gloffset_VertexAttribI4ivEXT 927
-#define _gloffset_VertexAttribI4svEXT 928
-#define _gloffset_VertexAttribI4ubvEXT 929
-#define _gloffset_VertexAttribI4uiEXT 930
-#define _gloffset_VertexAttribI4uivEXT 931
-#define _gloffset_VertexAttribI4usvEXT 932
-#define _gloffset_VertexAttribIPointerEXT 933
-#define _gloffset_FramebufferTextureLayerEXT 934
-#define _gloffset_ColorMaskIndexedEXT 935
-#define _gloffset_DisableIndexedEXT 936
-#define _gloffset_EnableIndexedEXT 937
-#define _gloffset_GetBooleanIndexedvEXT 938
-#define _gloffset_GetIntegerIndexedvEXT 939
-#define _gloffset_IsEnabledIndexedEXT 940
-#define _gloffset_ClearColorIiEXT 941
-#define _gloffset_ClearColorIuiEXT 942
-#define _gloffset_GetTexParameterIivEXT 943
-#define _gloffset_GetTexParameterIuivEXT 944
-#define _gloffset_TexParameterIivEXT 945
-#define _gloffset_TexParameterIuivEXT 946
-#define _gloffset_BeginConditionalRenderNV 947
-#define _gloffset_EndConditionalRenderNV 948
-#define _gloffset_BeginTransformFeedbackEXT 949
-#define _gloffset_BindBufferBaseEXT 950
-#define _gloffset_BindBufferOffsetEXT 951
-#define _gloffset_BindBufferRangeEXT 952
-#define _gloffset_EndTransformFeedbackEXT 953
-#define _gloffset_GetTransformFeedbackVaryingEXT 954
-#define _gloffset_TransformFeedbackVaryingsEXT 955
-#define _gloffset_ProvokingVertexEXT 956
-#define _gloffset_GetTexParameterPointervAPPLE 957
-#define _gloffset_TextureRangeAPPLE 958
-#define _gloffset_GetObjectParameterivAPPLE 959
-#define _gloffset_ObjectPurgeableAPPLE 960
-#define _gloffset_ObjectUnpurgeableAPPLE 961
-#define _gloffset_ActiveProgramEXT 962
-#define _gloffset_CreateShaderProgramEXT 963
-#define _gloffset_UseShaderProgramEXT 964
-#define _gloffset_TextureBarrierNV 965
-#define _gloffset_StencilFuncSeparateATI 966
-#define _gloffset_ProgramEnvParameters4fvEXT 967
-#define _gloffset_ProgramLocalParameters4fvEXT 968
-#define _gloffset_GetQueryObjecti64vEXT 969
-#define _gloffset_GetQueryObjectui64vEXT 970
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 971
-#define _gloffset_EGLImageTargetTexture2DOES 972
-
-#else                           /* !FEATURE_remap_table */
-
-#define driDispatchRemapTable_size 565
-extern int driDispatchRemapTable[driDispatchRemapTable_size];
-
-#define AttachShader_remap_index 0
-#define CreateProgram_remap_index 1
-#define CreateShader_remap_index 2
-#define DeleteProgram_remap_index 3
-#define DeleteShader_remap_index 4
-#define DetachShader_remap_index 5
-#define GetAttachedShaders_remap_index 6
-#define GetProgramInfoLog_remap_index 7
-#define GetProgramiv_remap_index 8
-#define GetShaderInfoLog_remap_index 9
-#define GetShaderiv_remap_index 10
-#define IsProgram_remap_index 11
-#define IsShader_remap_index 12
-#define StencilFuncSeparate_remap_index 13
-#define StencilMaskSeparate_remap_index 14
-#define StencilOpSeparate_remap_index 15
-#define UniformMatrix2x3fv_remap_index 16
-#define UniformMatrix2x4fv_remap_index 17
-#define UniformMatrix3x2fv_remap_index 18
-#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 TexBuffer_remap_index 28
-#define FramebufferTexture_remap_index 29
-#define GetBufferParameteri64v_remap_index 30
-#define GetInteger64i_v_remap_index 31
-#define VertexAttribDivisor_remap_index 32
-#define LoadTransposeMatrixdARB_remap_index 33
-#define LoadTransposeMatrixfARB_remap_index 34
-#define MultTransposeMatrixdARB_remap_index 35
-#define MultTransposeMatrixfARB_remap_index 36
-#define SampleCoverageARB_remap_index 37
-#define CompressedTexImage1DARB_remap_index 38
-#define CompressedTexImage2DARB_remap_index 39
-#define CompressedTexImage3DARB_remap_index 40
-#define CompressedTexSubImage1DARB_remap_index 41
-#define CompressedTexSubImage2DARB_remap_index 42
-#define CompressedTexSubImage3DARB_remap_index 43
-#define GetCompressedTexImageARB_remap_index 44
-#define DisableVertexAttribArrayARB_remap_index 45
-#define EnableVertexAttribArrayARB_remap_index 46
-#define GetProgramEnvParameterdvARB_remap_index 47
-#define GetProgramEnvParameterfvARB_remap_index 48
-#define GetProgramLocalParameterdvARB_remap_index 49
-#define GetProgramLocalParameterfvARB_remap_index 50
-#define GetProgramStringARB_remap_index 51
-#define GetProgramivARB_remap_index 52
-#define GetVertexAttribdvARB_remap_index 53
-#define GetVertexAttribfvARB_remap_index 54
-#define GetVertexAttribivARB_remap_index 55
-#define ProgramEnvParameter4dARB_remap_index 56
-#define ProgramEnvParameter4dvARB_remap_index 57
-#define ProgramEnvParameter4fARB_remap_index 58
-#define ProgramEnvParameter4fvARB_remap_index 59
-#define ProgramLocalParameter4dARB_remap_index 60
-#define ProgramLocalParameter4dvARB_remap_index 61
-#define ProgramLocalParameter4fARB_remap_index 62
-#define ProgramLocalParameter4fvARB_remap_index 63
-#define ProgramStringARB_remap_index 64
-#define VertexAttrib1dARB_remap_index 65
-#define VertexAttrib1dvARB_remap_index 66
-#define VertexAttrib1fARB_remap_index 67
-#define VertexAttrib1fvARB_remap_index 68
-#define VertexAttrib1sARB_remap_index 69
-#define VertexAttrib1svARB_remap_index 70
-#define VertexAttrib2dARB_remap_index 71
-#define VertexAttrib2dvARB_remap_index 72
-#define VertexAttrib2fARB_remap_index 73
-#define VertexAttrib2fvARB_remap_index 74
-#define VertexAttrib2sARB_remap_index 75
-#define VertexAttrib2svARB_remap_index 76
-#define VertexAttrib3dARB_remap_index 77
-#define VertexAttrib3dvARB_remap_index 78
-#define VertexAttrib3fARB_remap_index 79
-#define VertexAttrib3fvARB_remap_index 80
-#define VertexAttrib3sARB_remap_index 81
-#define VertexAttrib3svARB_remap_index 82
-#define VertexAttrib4NbvARB_remap_index 83
-#define VertexAttrib4NivARB_remap_index 84
-#define VertexAttrib4NsvARB_remap_index 85
-#define VertexAttrib4NubARB_remap_index 86
-#define VertexAttrib4NubvARB_remap_index 87
-#define VertexAttrib4NuivARB_remap_index 88
-#define VertexAttrib4NusvARB_remap_index 89
-#define VertexAttrib4bvARB_remap_index 90
-#define VertexAttrib4dARB_remap_index 91
-#define VertexAttrib4dvARB_remap_index 92
-#define VertexAttrib4fARB_remap_index 93
-#define VertexAttrib4fvARB_remap_index 94
-#define VertexAttrib4ivARB_remap_index 95
-#define VertexAttrib4sARB_remap_index 96
-#define VertexAttrib4svARB_remap_index 97
-#define VertexAttrib4ubvARB_remap_index 98
-#define VertexAttrib4uivARB_remap_index 99
-#define VertexAttrib4usvARB_remap_index 100
-#define VertexAttribPointerARB_remap_index 101
-#define BindBufferARB_remap_index 102
-#define BufferDataARB_remap_index 103
-#define BufferSubDataARB_remap_index 104
-#define DeleteBuffersARB_remap_index 105
-#define GenBuffersARB_remap_index 106
-#define GetBufferParameterivARB_remap_index 107
-#define GetBufferPointervARB_remap_index 108
-#define GetBufferSubDataARB_remap_index 109
-#define IsBufferARB_remap_index 110
-#define MapBufferARB_remap_index 111
-#define UnmapBufferARB_remap_index 112
-#define BeginQueryARB_remap_index 113
-#define DeleteQueriesARB_remap_index 114
-#define EndQueryARB_remap_index 115
-#define GenQueriesARB_remap_index 116
-#define GetQueryObjectivARB_remap_index 117
-#define GetQueryObjectuivARB_remap_index 118
-#define GetQueryivARB_remap_index 119
-#define IsQueryARB_remap_index 120
-#define AttachObjectARB_remap_index 121
-#define CompileShaderARB_remap_index 122
-#define CreateProgramObjectARB_remap_index 123
-#define CreateShaderObjectARB_remap_index 124
-#define DeleteObjectARB_remap_index 125
-#define DetachObjectARB_remap_index 126
-#define GetActiveUniformARB_remap_index 127
-#define GetAttachedObjectsARB_remap_index 128
-#define GetHandleARB_remap_index 129
-#define GetInfoLogARB_remap_index 130
-#define GetObjectParameterfvARB_remap_index 131
-#define GetObjectParameterivARB_remap_index 132
-#define GetShaderSourceARB_remap_index 133
-#define GetUniformLocationARB_remap_index 134
-#define GetUniformfvARB_remap_index 135
-#define GetUniformivARB_remap_index 136
-#define LinkProgramARB_remap_index 137
-#define ShaderSourceARB_remap_index 138
-#define Uniform1fARB_remap_index 139
-#define Uniform1fvARB_remap_index 140
-#define Uniform1iARB_remap_index 141
-#define Uniform1ivARB_remap_index 142
-#define Uniform2fARB_remap_index 143
-#define Uniform2fvARB_remap_index 144
-#define Uniform2iARB_remap_index 145
-#define Uniform2ivARB_remap_index 146
-#define Uniform3fARB_remap_index 147
-#define Uniform3fvARB_remap_index 148
-#define Uniform3iARB_remap_index 149
-#define Uniform3ivARB_remap_index 150
-#define Uniform4fARB_remap_index 151
-#define Uniform4fvARB_remap_index 152
-#define Uniform4iARB_remap_index 153
-#define Uniform4ivARB_remap_index 154
-#define UniformMatrix2fvARB_remap_index 155
-#define UniformMatrix3fvARB_remap_index 156
-#define UniformMatrix4fvARB_remap_index 157
-#define UseProgramObjectARB_remap_index 158
-#define ValidateProgramARB_remap_index 159
-#define BindAttribLocationARB_remap_index 160
-#define GetActiveAttribARB_remap_index 161
-#define GetAttribLocationARB_remap_index 162
-#define DrawBuffersARB_remap_index 163
-#define ClampColorARB_remap_index 164
-#define DrawArraysInstancedARB_remap_index 165
-#define DrawElementsInstancedARB_remap_index 166
-#define RenderbufferStorageMultisample_remap_index 167
-#define FramebufferTextureARB_remap_index 168
-#define FramebufferTextureFaceARB_remap_index 169
-#define ProgramParameteriARB_remap_index 170
-#define VertexAttribDivisorARB_remap_index 171
-#define FlushMappedBufferRange_remap_index 172
-#define MapBufferRange_remap_index 173
-#define TexBufferARB_remap_index 174
-#define BindVertexArray_remap_index 175
-#define GenVertexArrays_remap_index 176
-#define CopyBufferSubData_remap_index 177
-#define ClientWaitSync_remap_index 178
-#define DeleteSync_remap_index 179
-#define FenceSync_remap_index 180
-#define GetInteger64v_remap_index 181
-#define GetSynciv_remap_index 182
-#define IsSync_remap_index 183
-#define WaitSync_remap_index 184
-#define DrawElementsBaseVertex_remap_index 185
-#define DrawElementsInstancedBaseVertex_remap_index 186
-#define DrawRangeElementsBaseVertex_remap_index 187
-#define MultiDrawElementsBaseVertex_remap_index 188
-#define BlendEquationSeparateiARB_remap_index 189
-#define BlendEquationiARB_remap_index 190
-#define BlendFuncSeparateiARB_remap_index 191
-#define BlendFunciARB_remap_index 192
-#define BindSampler_remap_index 193
-#define DeleteSamplers_remap_index 194
-#define GenSamplers_remap_index 195
-#define GetSamplerParameterIiv_remap_index 196
-#define GetSamplerParameterIuiv_remap_index 197
-#define GetSamplerParameterfv_remap_index 198
-#define GetSamplerParameteriv_remap_index 199
-#define IsSampler_remap_index 200
-#define SamplerParameterIiv_remap_index 201
-#define SamplerParameterIuiv_remap_index 202
-#define SamplerParameterf_remap_index 203
-#define SamplerParameterfv_remap_index 204
-#define SamplerParameteri_remap_index 205
-#define SamplerParameteriv_remap_index 206
-#define ColorP3ui_remap_index 207
-#define ColorP3uiv_remap_index 208
-#define ColorP4ui_remap_index 209
-#define ColorP4uiv_remap_index 210
-#define MultiTexCoordP1ui_remap_index 211
-#define MultiTexCoordP1uiv_remap_index 212
-#define MultiTexCoordP2ui_remap_index 213
-#define MultiTexCoordP2uiv_remap_index 214
-#define MultiTexCoordP3ui_remap_index 215
-#define MultiTexCoordP3uiv_remap_index 216
-#define MultiTexCoordP4ui_remap_index 217
-#define MultiTexCoordP4uiv_remap_index 218
-#define NormalP3ui_remap_index 219
-#define NormalP3uiv_remap_index 220
-#define SecondaryColorP3ui_remap_index 221
-#define SecondaryColorP3uiv_remap_index 222
-#define TexCoordP1ui_remap_index 223
-#define TexCoordP1uiv_remap_index 224
-#define TexCoordP2ui_remap_index 225
-#define TexCoordP2uiv_remap_index 226
-#define TexCoordP3ui_remap_index 227
-#define TexCoordP3uiv_remap_index 228
-#define TexCoordP4ui_remap_index 229
-#define TexCoordP4uiv_remap_index 230
-#define VertexAttribP1ui_remap_index 231
-#define VertexAttribP1uiv_remap_index 232
-#define VertexAttribP2ui_remap_index 233
-#define VertexAttribP2uiv_remap_index 234
-#define VertexAttribP3ui_remap_index 235
-#define VertexAttribP3uiv_remap_index 236
-#define VertexAttribP4ui_remap_index 237
-#define VertexAttribP4uiv_remap_index 238
-#define VertexP2ui_remap_index 239
-#define VertexP2uiv_remap_index 240
-#define VertexP3ui_remap_index 241
-#define VertexP3uiv_remap_index 242
-#define VertexP4ui_remap_index 243
-#define VertexP4uiv_remap_index 244
-#define BindTransformFeedback_remap_index 245
-#define DeleteTransformFeedbacks_remap_index 246
-#define DrawTransformFeedback_remap_index 247
-#define GenTransformFeedbacks_remap_index 248
-#define IsTransformFeedback_remap_index 249
-#define PauseTransformFeedback_remap_index 250
-#define ResumeTransformFeedback_remap_index 251
-#define ClearDepthf_remap_index 252
-#define DepthRangef_remap_index 253
-#define GetShaderPrecisionFormat_remap_index 254
-#define ReleaseShaderCompiler_remap_index 255
-#define ShaderBinary_remap_index 256
-#define GetGraphicsResetStatusARB_remap_index 257
-#define GetnColorTableARB_remap_index 258
-#define GetnCompressedTexImageARB_remap_index 259
-#define GetnConvolutionFilterARB_remap_index 260
-#define GetnHistogramARB_remap_index 261
-#define GetnMapdvARB_remap_index 262
-#define GetnMapfvARB_remap_index 263
-#define GetnMapivARB_remap_index 264
-#define GetnMinmaxARB_remap_index 265
-#define GetnPixelMapfvARB_remap_index 266
-#define GetnPixelMapuivARB_remap_index 267
-#define GetnPixelMapusvARB_remap_index 268
-#define GetnPolygonStippleARB_remap_index 269
-#define GetnSeparableFilterARB_remap_index 270
-#define GetnTexImageARB_remap_index 271
-#define GetnUniformdvARB_remap_index 272
-#define GetnUniformfvARB_remap_index 273
-#define GetnUniformivARB_remap_index 274
-#define GetnUniformuivARB_remap_index 275
-#define ReadnPixelsARB_remap_index 276
-#define TexStorage1D_remap_index 277
-#define TexStorage2D_remap_index 278
-#define TexStorage3D_remap_index 279
-#define TextureStorage1DEXT_remap_index 280
-#define TextureStorage2DEXT_remap_index 281
-#define TextureStorage3DEXT_remap_index 282
-#define PolygonOffsetEXT_remap_index 283
-#define GetPixelTexGenParameterfvSGIS_remap_index 284
-#define GetPixelTexGenParameterivSGIS_remap_index 285
-#define PixelTexGenParameterfSGIS_remap_index 286
-#define PixelTexGenParameterfvSGIS_remap_index 287
-#define PixelTexGenParameteriSGIS_remap_index 288
-#define PixelTexGenParameterivSGIS_remap_index 289
-#define SampleMaskSGIS_remap_index 290
-#define SamplePatternSGIS_remap_index 291
-#define ColorPointerEXT_remap_index 292
-#define EdgeFlagPointerEXT_remap_index 293
-#define IndexPointerEXT_remap_index 294
-#define NormalPointerEXT_remap_index 295
-#define TexCoordPointerEXT_remap_index 296
-#define VertexPointerEXT_remap_index 297
-#define PointParameterfEXT_remap_index 298
-#define PointParameterfvEXT_remap_index 299
-#define LockArraysEXT_remap_index 300
-#define UnlockArraysEXT_remap_index 301
-#define SecondaryColor3bEXT_remap_index 302
-#define SecondaryColor3bvEXT_remap_index 303
-#define SecondaryColor3dEXT_remap_index 304
-#define SecondaryColor3dvEXT_remap_index 305
-#define SecondaryColor3fEXT_remap_index 306
-#define SecondaryColor3fvEXT_remap_index 307
-#define SecondaryColor3iEXT_remap_index 308
-#define SecondaryColor3ivEXT_remap_index 309
-#define SecondaryColor3sEXT_remap_index 310
-#define SecondaryColor3svEXT_remap_index 311
-#define SecondaryColor3ubEXT_remap_index 312
-#define SecondaryColor3ubvEXT_remap_index 313
-#define SecondaryColor3uiEXT_remap_index 314
-#define SecondaryColor3uivEXT_remap_index 315
-#define SecondaryColor3usEXT_remap_index 316
-#define SecondaryColor3usvEXT_remap_index 317
-#define SecondaryColorPointerEXT_remap_index 318
-#define MultiDrawArraysEXT_remap_index 319
-#define MultiDrawElementsEXT_remap_index 320
-#define FogCoordPointerEXT_remap_index 321
-#define FogCoorddEXT_remap_index 322
-#define FogCoorddvEXT_remap_index 323
-#define FogCoordfEXT_remap_index 324
-#define FogCoordfvEXT_remap_index 325
-#define PixelTexGenSGIX_remap_index 326
-#define BlendFuncSeparateEXT_remap_index 327
-#define FlushVertexArrayRangeNV_remap_index 328
-#define VertexArrayRangeNV_remap_index 329
-#define CombinerInputNV_remap_index 330
-#define CombinerOutputNV_remap_index 331
-#define CombinerParameterfNV_remap_index 332
-#define CombinerParameterfvNV_remap_index 333
-#define CombinerParameteriNV_remap_index 334
-#define CombinerParameterivNV_remap_index 335
-#define FinalCombinerInputNV_remap_index 336
-#define GetCombinerInputParameterfvNV_remap_index 337
-#define GetCombinerInputParameterivNV_remap_index 338
-#define GetCombinerOutputParameterfvNV_remap_index 339
-#define GetCombinerOutputParameterivNV_remap_index 340
-#define GetFinalCombinerInputParameterfvNV_remap_index 341
-#define GetFinalCombinerInputParameterivNV_remap_index 342
-#define ResizeBuffersMESA_remap_index 343
-#define WindowPos2dMESA_remap_index 344
-#define WindowPos2dvMESA_remap_index 345
-#define WindowPos2fMESA_remap_index 346
-#define WindowPos2fvMESA_remap_index 347
-#define WindowPos2iMESA_remap_index 348
-#define WindowPos2ivMESA_remap_index 349
-#define WindowPos2sMESA_remap_index 350
-#define WindowPos2svMESA_remap_index 351
-#define WindowPos3dMESA_remap_index 352
-#define WindowPos3dvMESA_remap_index 353
-#define WindowPos3fMESA_remap_index 354
-#define WindowPos3fvMESA_remap_index 355
-#define WindowPos3iMESA_remap_index 356
-#define WindowPos3ivMESA_remap_index 357
-#define WindowPos3sMESA_remap_index 358
-#define WindowPos3svMESA_remap_index 359
-#define WindowPos4dMESA_remap_index 360
-#define WindowPos4dvMESA_remap_index 361
-#define WindowPos4fMESA_remap_index 362
-#define WindowPos4fvMESA_remap_index 363
-#define WindowPos4iMESA_remap_index 364
-#define WindowPos4ivMESA_remap_index 365
-#define WindowPos4sMESA_remap_index 366
-#define WindowPos4svMESA_remap_index 367
-#define MultiModeDrawArraysIBM_remap_index 368
-#define MultiModeDrawElementsIBM_remap_index 369
-#define DeleteFencesNV_remap_index 370
-#define FinishFenceNV_remap_index 371
-#define GenFencesNV_remap_index 372
-#define GetFenceivNV_remap_index 373
-#define IsFenceNV_remap_index 374
-#define SetFenceNV_remap_index 375
-#define TestFenceNV_remap_index 376
-#define AreProgramsResidentNV_remap_index 377
-#define BindProgramNV_remap_index 378
-#define DeleteProgramsNV_remap_index 379
-#define ExecuteProgramNV_remap_index 380
-#define GenProgramsNV_remap_index 381
-#define GetProgramParameterdvNV_remap_index 382
-#define GetProgramParameterfvNV_remap_index 383
-#define GetProgramStringNV_remap_index 384
-#define GetProgramivNV_remap_index 385
-#define GetTrackMatrixivNV_remap_index 386
-#define GetVertexAttribPointervNV_remap_index 387
-#define GetVertexAttribdvNV_remap_index 388
-#define GetVertexAttribfvNV_remap_index 389
-#define GetVertexAttribivNV_remap_index 390
-#define IsProgramNV_remap_index 391
-#define LoadProgramNV_remap_index 392
-#define ProgramParameters4dvNV_remap_index 393
-#define ProgramParameters4fvNV_remap_index 394
-#define RequestResidentProgramsNV_remap_index 395
-#define TrackMatrixNV_remap_index 396
-#define VertexAttrib1dNV_remap_index 397
-#define VertexAttrib1dvNV_remap_index 398
-#define VertexAttrib1fNV_remap_index 399
-#define VertexAttrib1fvNV_remap_index 400
-#define VertexAttrib1sNV_remap_index 401
-#define VertexAttrib1svNV_remap_index 402
-#define VertexAttrib2dNV_remap_index 403
-#define VertexAttrib2dvNV_remap_index 404
-#define VertexAttrib2fNV_remap_index 405
-#define VertexAttrib2fvNV_remap_index 406
-#define VertexAttrib2sNV_remap_index 407
-#define VertexAttrib2svNV_remap_index 408
-#define VertexAttrib3dNV_remap_index 409
-#define VertexAttrib3dvNV_remap_index 410
-#define VertexAttrib3fNV_remap_index 411
-#define VertexAttrib3fvNV_remap_index 412
-#define VertexAttrib3sNV_remap_index 413
-#define VertexAttrib3svNV_remap_index 414
-#define VertexAttrib4dNV_remap_index 415
-#define VertexAttrib4dvNV_remap_index 416
-#define VertexAttrib4fNV_remap_index 417
-#define VertexAttrib4fvNV_remap_index 418
-#define VertexAttrib4sNV_remap_index 419
-#define VertexAttrib4svNV_remap_index 420
-#define VertexAttrib4ubNV_remap_index 421
-#define VertexAttrib4ubvNV_remap_index 422
-#define VertexAttribPointerNV_remap_index 423
-#define VertexAttribs1dvNV_remap_index 424
-#define VertexAttribs1fvNV_remap_index 425
-#define VertexAttribs1svNV_remap_index 426
-#define VertexAttribs2dvNV_remap_index 427
-#define VertexAttribs2fvNV_remap_index 428
-#define VertexAttribs2svNV_remap_index 429
-#define VertexAttribs3dvNV_remap_index 430
-#define VertexAttribs3fvNV_remap_index 431
-#define VertexAttribs3svNV_remap_index 432
-#define VertexAttribs4dvNV_remap_index 433
-#define VertexAttribs4fvNV_remap_index 434
-#define VertexAttribs4svNV_remap_index 435
-#define VertexAttribs4ubvNV_remap_index 436
-#define GetTexBumpParameterfvATI_remap_index 437
-#define GetTexBumpParameterivATI_remap_index 438
-#define TexBumpParameterfvATI_remap_index 439
-#define TexBumpParameterivATI_remap_index 440
-#define AlphaFragmentOp1ATI_remap_index 441
-#define AlphaFragmentOp2ATI_remap_index 442
-#define AlphaFragmentOp3ATI_remap_index 443
-#define BeginFragmentShaderATI_remap_index 444
-#define BindFragmentShaderATI_remap_index 445
-#define ColorFragmentOp1ATI_remap_index 446
-#define ColorFragmentOp2ATI_remap_index 447
-#define ColorFragmentOp3ATI_remap_index 448
-#define DeleteFragmentShaderATI_remap_index 449
-#define EndFragmentShaderATI_remap_index 450
-#define GenFragmentShadersATI_remap_index 451
-#define PassTexCoordATI_remap_index 452
-#define SampleMapATI_remap_index 453
-#define SetFragmentShaderConstantATI_remap_index 454
-#define PointParameteriNV_remap_index 455
-#define PointParameterivNV_remap_index 456
-#define ActiveStencilFaceEXT_remap_index 457
-#define BindVertexArrayAPPLE_remap_index 458
-#define DeleteVertexArraysAPPLE_remap_index 459
-#define GenVertexArraysAPPLE_remap_index 460
-#define IsVertexArrayAPPLE_remap_index 461
-#define GetProgramNamedParameterdvNV_remap_index 462
-#define GetProgramNamedParameterfvNV_remap_index 463
-#define ProgramNamedParameter4dNV_remap_index 464
-#define ProgramNamedParameter4dvNV_remap_index 465
-#define ProgramNamedParameter4fNV_remap_index 466
-#define ProgramNamedParameter4fvNV_remap_index 467
-#define PrimitiveRestartIndexNV_remap_index 468
-#define PrimitiveRestartNV_remap_index 469
-#define DepthBoundsEXT_remap_index 470
-#define BlendEquationSeparateEXT_remap_index 471
-#define BindFramebufferEXT_remap_index 472
-#define BindRenderbufferEXT_remap_index 473
-#define CheckFramebufferStatusEXT_remap_index 474
-#define DeleteFramebuffersEXT_remap_index 475
-#define DeleteRenderbuffersEXT_remap_index 476
-#define FramebufferRenderbufferEXT_remap_index 477
-#define FramebufferTexture1DEXT_remap_index 478
-#define FramebufferTexture2DEXT_remap_index 479
-#define FramebufferTexture3DEXT_remap_index 480
-#define GenFramebuffersEXT_remap_index 481
-#define GenRenderbuffersEXT_remap_index 482
-#define GenerateMipmapEXT_remap_index 483
-#define GetFramebufferAttachmentParameterivEXT_remap_index 484
-#define GetRenderbufferParameterivEXT_remap_index 485
-#define IsFramebufferEXT_remap_index 486
-#define IsRenderbufferEXT_remap_index 487
-#define RenderbufferStorageEXT_remap_index 488
-#define BlitFramebufferEXT_remap_index 489
-#define BufferParameteriAPPLE_remap_index 490
-#define FlushMappedBufferRangeAPPLE_remap_index 491
-#define BindFragDataLocationEXT_remap_index 492
-#define GetFragDataLocationEXT_remap_index 493
-#define GetUniformuivEXT_remap_index 494
-#define GetVertexAttribIivEXT_remap_index 495
-#define GetVertexAttribIuivEXT_remap_index 496
-#define Uniform1uiEXT_remap_index 497
-#define Uniform1uivEXT_remap_index 498
-#define Uniform2uiEXT_remap_index 499
-#define Uniform2uivEXT_remap_index 500
-#define Uniform3uiEXT_remap_index 501
-#define Uniform3uivEXT_remap_index 502
-#define Uniform4uiEXT_remap_index 503
-#define Uniform4uivEXT_remap_index 504
-#define VertexAttribI1iEXT_remap_index 505
-#define VertexAttribI1ivEXT_remap_index 506
-#define VertexAttribI1uiEXT_remap_index 507
-#define VertexAttribI1uivEXT_remap_index 508
-#define VertexAttribI2iEXT_remap_index 509
-#define VertexAttribI2ivEXT_remap_index 510
-#define VertexAttribI2uiEXT_remap_index 511
-#define VertexAttribI2uivEXT_remap_index 512
-#define VertexAttribI3iEXT_remap_index 513
-#define VertexAttribI3ivEXT_remap_index 514
-#define VertexAttribI3uiEXT_remap_index 515
-#define VertexAttribI3uivEXT_remap_index 516
-#define VertexAttribI4bvEXT_remap_index 517
-#define VertexAttribI4iEXT_remap_index 518
-#define VertexAttribI4ivEXT_remap_index 519
-#define VertexAttribI4svEXT_remap_index 520
-#define VertexAttribI4ubvEXT_remap_index 521
-#define VertexAttribI4uiEXT_remap_index 522
-#define VertexAttribI4uivEXT_remap_index 523
-#define VertexAttribI4usvEXT_remap_index 524
-#define VertexAttribIPointerEXT_remap_index 525
-#define FramebufferTextureLayerEXT_remap_index 526
-#define ColorMaskIndexedEXT_remap_index 527
-#define DisableIndexedEXT_remap_index 528
-#define EnableIndexedEXT_remap_index 529
-#define GetBooleanIndexedvEXT_remap_index 530
-#define GetIntegerIndexedvEXT_remap_index 531
-#define IsEnabledIndexedEXT_remap_index 532
-#define ClearColorIiEXT_remap_index 533
-#define ClearColorIuiEXT_remap_index 534
-#define GetTexParameterIivEXT_remap_index 535
-#define GetTexParameterIuivEXT_remap_index 536
-#define TexParameterIivEXT_remap_index 537
-#define TexParameterIuivEXT_remap_index 538
-#define BeginConditionalRenderNV_remap_index 539
-#define EndConditionalRenderNV_remap_index 540
-#define BeginTransformFeedbackEXT_remap_index 541
-#define BindBufferBaseEXT_remap_index 542
-#define BindBufferOffsetEXT_remap_index 543
-#define BindBufferRangeEXT_remap_index 544
-#define EndTransformFeedbackEXT_remap_index 545
-#define GetTransformFeedbackVaryingEXT_remap_index 546
-#define TransformFeedbackVaryingsEXT_remap_index 547
-#define ProvokingVertexEXT_remap_index 548
-#define GetTexParameterPointervAPPLE_remap_index 549
-#define TextureRangeAPPLE_remap_index 550
-#define GetObjectParameterivAPPLE_remap_index 551
-#define ObjectPurgeableAPPLE_remap_index 552
-#define ObjectUnpurgeableAPPLE_remap_index 553
-#define ActiveProgramEXT_remap_index 554
-#define CreateShaderProgramEXT_remap_index 555
-#define UseShaderProgramEXT_remap_index 556
-#define TextureBarrierNV_remap_index 557
-#define StencilFuncSeparateATI_remap_index 558
-#define ProgramEnvParameters4fvEXT_remap_index 559
-#define ProgramLocalParameters4fvEXT_remap_index 560
-#define GetQueryObjecti64vEXT_remap_index 561
-#define GetQueryObjectui64vEXT_remap_index 562
-#define EGLImageTargetRenderbufferStorageOES_remap_index 563
-#define EGLImageTargetTexture2DOES_remap_index 564
-
-#define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index]
-#define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index]
-#define _gloffset_CreateShader driDispatchRemapTable[CreateShader_remap_index]
-#define _gloffset_DeleteProgram driDispatchRemapTable[DeleteProgram_remap_index]
-#define _gloffset_DeleteShader driDispatchRemapTable[DeleteShader_remap_index]
-#define _gloffset_DetachShader driDispatchRemapTable[DetachShader_remap_index]
-#define _gloffset_GetAttachedShaders driDispatchRemapTable[GetAttachedShaders_remap_index]
-#define _gloffset_GetProgramInfoLog driDispatchRemapTable[GetProgramInfoLog_remap_index]
-#define _gloffset_GetProgramiv driDispatchRemapTable[GetProgramiv_remap_index]
-#define _gloffset_GetShaderInfoLog driDispatchRemapTable[GetShaderInfoLog_remap_index]
-#define _gloffset_GetShaderiv driDispatchRemapTable[GetShaderiv_remap_index]
-#define _gloffset_IsProgram driDispatchRemapTable[IsProgram_remap_index]
-#define _gloffset_IsShader driDispatchRemapTable[IsShader_remap_index]
-#define _gloffset_StencilFuncSeparate driDispatchRemapTable[StencilFuncSeparate_remap_index]
-#define _gloffset_StencilMaskSeparate driDispatchRemapTable[StencilMaskSeparate_remap_index]
-#define _gloffset_StencilOpSeparate driDispatchRemapTable[StencilOpSeparate_remap_index]
-#define _gloffset_UniformMatrix2x3fv driDispatchRemapTable[UniformMatrix2x3fv_remap_index]
-#define _gloffset_UniformMatrix2x4fv driDispatchRemapTable[UniformMatrix2x4fv_remap_index]
-#define _gloffset_UniformMatrix3x2fv driDispatchRemapTable[UniformMatrix3x2fv_remap_index]
-#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]
-#define _gloffset_ClearBufferuiv driDispatchRemapTable[ClearBufferuiv_remap_index]
-#define _gloffset_GetStringi driDispatchRemapTable[GetStringi_remap_index]
-#define _gloffset_TexBuffer driDispatchRemapTable[TexBuffer_remap_index]
-#define _gloffset_FramebufferTexture driDispatchRemapTable[FramebufferTexture_remap_index]
-#define _gloffset_GetBufferParameteri64v driDispatchRemapTable[GetBufferParameteri64v_remap_index]
-#define _gloffset_GetInteger64i_v driDispatchRemapTable[GetInteger64i_v_remap_index]
-#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]
-#define _gloffset_MultTransposeMatrixfARB driDispatchRemapTable[MultTransposeMatrixfARB_remap_index]
-#define _gloffset_SampleCoverageARB driDispatchRemapTable[SampleCoverageARB_remap_index]
-#define _gloffset_CompressedTexImage1DARB driDispatchRemapTable[CompressedTexImage1DARB_remap_index]
-#define _gloffset_CompressedTexImage2DARB driDispatchRemapTable[CompressedTexImage2DARB_remap_index]
-#define _gloffset_CompressedTexImage3DARB driDispatchRemapTable[CompressedTexImage3DARB_remap_index]
-#define _gloffset_CompressedTexSubImage1DARB driDispatchRemapTable[CompressedTexSubImage1DARB_remap_index]
-#define _gloffset_CompressedTexSubImage2DARB driDispatchRemapTable[CompressedTexSubImage2DARB_remap_index]
-#define _gloffset_CompressedTexSubImage3DARB driDispatchRemapTable[CompressedTexSubImage3DARB_remap_index]
-#define _gloffset_GetCompressedTexImageARB driDispatchRemapTable[GetCompressedTexImageARB_remap_index]
-#define _gloffset_DisableVertexAttribArrayARB driDispatchRemapTable[DisableVertexAttribArrayARB_remap_index]
-#define _gloffset_EnableVertexAttribArrayARB driDispatchRemapTable[EnableVertexAttribArrayARB_remap_index]
-#define _gloffset_GetProgramEnvParameterdvARB driDispatchRemapTable[GetProgramEnvParameterdvARB_remap_index]
-#define _gloffset_GetProgramEnvParameterfvARB driDispatchRemapTable[GetProgramEnvParameterfvARB_remap_index]
-#define _gloffset_GetProgramLocalParameterdvARB driDispatchRemapTable[GetProgramLocalParameterdvARB_remap_index]
-#define _gloffset_GetProgramLocalParameterfvARB driDispatchRemapTable[GetProgramLocalParameterfvARB_remap_index]
-#define _gloffset_GetProgramStringARB driDispatchRemapTable[GetProgramStringARB_remap_index]
-#define _gloffset_GetProgramivARB driDispatchRemapTable[GetProgramivARB_remap_index]
-#define _gloffset_GetVertexAttribdvARB driDispatchRemapTable[GetVertexAttribdvARB_remap_index]
-#define _gloffset_GetVertexAttribfvARB driDispatchRemapTable[GetVertexAttribfvARB_remap_index]
-#define _gloffset_GetVertexAttribivARB driDispatchRemapTable[GetVertexAttribivARB_remap_index]
-#define _gloffset_ProgramEnvParameter4dARB driDispatchRemapTable[ProgramEnvParameter4dARB_remap_index]
-#define _gloffset_ProgramEnvParameter4dvARB driDispatchRemapTable[ProgramEnvParameter4dvARB_remap_index]
-#define _gloffset_ProgramEnvParameter4fARB driDispatchRemapTable[ProgramEnvParameter4fARB_remap_index]
-#define _gloffset_ProgramEnvParameter4fvARB driDispatchRemapTable[ProgramEnvParameter4fvARB_remap_index]
-#define _gloffset_ProgramLocalParameter4dARB driDispatchRemapTable[ProgramLocalParameter4dARB_remap_index]
-#define _gloffset_ProgramLocalParameter4dvARB driDispatchRemapTable[ProgramLocalParameter4dvARB_remap_index]
-#define _gloffset_ProgramLocalParameter4fARB driDispatchRemapTable[ProgramLocalParameter4fARB_remap_index]
-#define _gloffset_ProgramLocalParameter4fvARB driDispatchRemapTable[ProgramLocalParameter4fvARB_remap_index]
-#define _gloffset_ProgramStringARB driDispatchRemapTable[ProgramStringARB_remap_index]
-#define _gloffset_VertexAttrib1dARB driDispatchRemapTable[VertexAttrib1dARB_remap_index]
-#define _gloffset_VertexAttrib1dvARB driDispatchRemapTable[VertexAttrib1dvARB_remap_index]
-#define _gloffset_VertexAttrib1fARB driDispatchRemapTable[VertexAttrib1fARB_remap_index]
-#define _gloffset_VertexAttrib1fvARB driDispatchRemapTable[VertexAttrib1fvARB_remap_index]
-#define _gloffset_VertexAttrib1sARB driDispatchRemapTable[VertexAttrib1sARB_remap_index]
-#define _gloffset_VertexAttrib1svARB driDispatchRemapTable[VertexAttrib1svARB_remap_index]
-#define _gloffset_VertexAttrib2dARB driDispatchRemapTable[VertexAttrib2dARB_remap_index]
-#define _gloffset_VertexAttrib2dvARB driDispatchRemapTable[VertexAttrib2dvARB_remap_index]
-#define _gloffset_VertexAttrib2fARB driDispatchRemapTable[VertexAttrib2fARB_remap_index]
-#define _gloffset_VertexAttrib2fvARB driDispatchRemapTable[VertexAttrib2fvARB_remap_index]
-#define _gloffset_VertexAttrib2sARB driDispatchRemapTable[VertexAttrib2sARB_remap_index]
-#define _gloffset_VertexAttrib2svARB driDispatchRemapTable[VertexAttrib2svARB_remap_index]
-#define _gloffset_VertexAttrib3dARB driDispatchRemapTable[VertexAttrib3dARB_remap_index]
-#define _gloffset_VertexAttrib3dvARB driDispatchRemapTable[VertexAttrib3dvARB_remap_index]
-#define _gloffset_VertexAttrib3fARB driDispatchRemapTable[VertexAttrib3fARB_remap_index]
-#define _gloffset_VertexAttrib3fvARB driDispatchRemapTable[VertexAttrib3fvARB_remap_index]
-#define _gloffset_VertexAttrib3sARB driDispatchRemapTable[VertexAttrib3sARB_remap_index]
-#define _gloffset_VertexAttrib3svARB driDispatchRemapTable[VertexAttrib3svARB_remap_index]
-#define _gloffset_VertexAttrib4NbvARB driDispatchRemapTable[VertexAttrib4NbvARB_remap_index]
-#define _gloffset_VertexAttrib4NivARB driDispatchRemapTable[VertexAttrib4NivARB_remap_index]
-#define _gloffset_VertexAttrib4NsvARB driDispatchRemapTable[VertexAttrib4NsvARB_remap_index]
-#define _gloffset_VertexAttrib4NubARB driDispatchRemapTable[VertexAttrib4NubARB_remap_index]
-#define _gloffset_VertexAttrib4NubvARB driDispatchRemapTable[VertexAttrib4NubvARB_remap_index]
-#define _gloffset_VertexAttrib4NuivARB driDispatchRemapTable[VertexAttrib4NuivARB_remap_index]
-#define _gloffset_VertexAttrib4NusvARB driDispatchRemapTable[VertexAttrib4NusvARB_remap_index]
-#define _gloffset_VertexAttrib4bvARB driDispatchRemapTable[VertexAttrib4bvARB_remap_index]
-#define _gloffset_VertexAttrib4dARB driDispatchRemapTable[VertexAttrib4dARB_remap_index]
-#define _gloffset_VertexAttrib4dvARB driDispatchRemapTable[VertexAttrib4dvARB_remap_index]
-#define _gloffset_VertexAttrib4fARB driDispatchRemapTable[VertexAttrib4fARB_remap_index]
-#define _gloffset_VertexAttrib4fvARB driDispatchRemapTable[VertexAttrib4fvARB_remap_index]
-#define _gloffset_VertexAttrib4ivARB driDispatchRemapTable[VertexAttrib4ivARB_remap_index]
-#define _gloffset_VertexAttrib4sARB driDispatchRemapTable[VertexAttrib4sARB_remap_index]
-#define _gloffset_VertexAttrib4svARB driDispatchRemapTable[VertexAttrib4svARB_remap_index]
-#define _gloffset_VertexAttrib4ubvARB driDispatchRemapTable[VertexAttrib4ubvARB_remap_index]
-#define _gloffset_VertexAttrib4uivARB driDispatchRemapTable[VertexAttrib4uivARB_remap_index]
-#define _gloffset_VertexAttrib4usvARB driDispatchRemapTable[VertexAttrib4usvARB_remap_index]
-#define _gloffset_VertexAttribPointerARB driDispatchRemapTable[VertexAttribPointerARB_remap_index]
-#define _gloffset_BindBufferARB driDispatchRemapTable[BindBufferARB_remap_index]
-#define _gloffset_BufferDataARB driDispatchRemapTable[BufferDataARB_remap_index]
-#define _gloffset_BufferSubDataARB driDispatchRemapTable[BufferSubDataARB_remap_index]
-#define _gloffset_DeleteBuffersARB driDispatchRemapTable[DeleteBuffersARB_remap_index]
-#define _gloffset_GenBuffersARB driDispatchRemapTable[GenBuffersARB_remap_index]
-#define _gloffset_GetBufferParameterivARB driDispatchRemapTable[GetBufferParameterivARB_remap_index]
-#define _gloffset_GetBufferPointervARB driDispatchRemapTable[GetBufferPointervARB_remap_index]
-#define _gloffset_GetBufferSubDataARB driDispatchRemapTable[GetBufferSubDataARB_remap_index]
-#define _gloffset_IsBufferARB driDispatchRemapTable[IsBufferARB_remap_index]
-#define _gloffset_MapBufferARB driDispatchRemapTable[MapBufferARB_remap_index]
-#define _gloffset_UnmapBufferARB driDispatchRemapTable[UnmapBufferARB_remap_index]
-#define _gloffset_BeginQueryARB driDispatchRemapTable[BeginQueryARB_remap_index]
-#define _gloffset_DeleteQueriesARB driDispatchRemapTable[DeleteQueriesARB_remap_index]
-#define _gloffset_EndQueryARB driDispatchRemapTable[EndQueryARB_remap_index]
-#define _gloffset_GenQueriesARB driDispatchRemapTable[GenQueriesARB_remap_index]
-#define _gloffset_GetQueryObjectivARB driDispatchRemapTable[GetQueryObjectivARB_remap_index]
-#define _gloffset_GetQueryObjectuivARB driDispatchRemapTable[GetQueryObjectuivARB_remap_index]
-#define _gloffset_GetQueryivARB driDispatchRemapTable[GetQueryivARB_remap_index]
-#define _gloffset_IsQueryARB driDispatchRemapTable[IsQueryARB_remap_index]
-#define _gloffset_AttachObjectARB driDispatchRemapTable[AttachObjectARB_remap_index]
-#define _gloffset_CompileShaderARB driDispatchRemapTable[CompileShaderARB_remap_index]
-#define _gloffset_CreateProgramObjectARB driDispatchRemapTable[CreateProgramObjectARB_remap_index]
-#define _gloffset_CreateShaderObjectARB driDispatchRemapTable[CreateShaderObjectARB_remap_index]
-#define _gloffset_DeleteObjectARB driDispatchRemapTable[DeleteObjectARB_remap_index]
-#define _gloffset_DetachObjectARB driDispatchRemapTable[DetachObjectARB_remap_index]
-#define _gloffset_GetActiveUniformARB driDispatchRemapTable[GetActiveUniformARB_remap_index]
-#define _gloffset_GetAttachedObjectsARB driDispatchRemapTable[GetAttachedObjectsARB_remap_index]
-#define _gloffset_GetHandleARB driDispatchRemapTable[GetHandleARB_remap_index]
-#define _gloffset_GetInfoLogARB driDispatchRemapTable[GetInfoLogARB_remap_index]
-#define _gloffset_GetObjectParameterfvARB driDispatchRemapTable[GetObjectParameterfvARB_remap_index]
-#define _gloffset_GetObjectParameterivARB driDispatchRemapTable[GetObjectParameterivARB_remap_index]
-#define _gloffset_GetShaderSourceARB driDispatchRemapTable[GetShaderSourceARB_remap_index]
-#define _gloffset_GetUniformLocationARB driDispatchRemapTable[GetUniformLocationARB_remap_index]
-#define _gloffset_GetUniformfvARB driDispatchRemapTable[GetUniformfvARB_remap_index]
-#define _gloffset_GetUniformivARB driDispatchRemapTable[GetUniformivARB_remap_index]
-#define _gloffset_LinkProgramARB driDispatchRemapTable[LinkProgramARB_remap_index]
-#define _gloffset_ShaderSourceARB driDispatchRemapTable[ShaderSourceARB_remap_index]
-#define _gloffset_Uniform1fARB driDispatchRemapTable[Uniform1fARB_remap_index]
-#define _gloffset_Uniform1fvARB driDispatchRemapTable[Uniform1fvARB_remap_index]
-#define _gloffset_Uniform1iARB driDispatchRemapTable[Uniform1iARB_remap_index]
-#define _gloffset_Uniform1ivARB driDispatchRemapTable[Uniform1ivARB_remap_index]
-#define _gloffset_Uniform2fARB driDispatchRemapTable[Uniform2fARB_remap_index]
-#define _gloffset_Uniform2fvARB driDispatchRemapTable[Uniform2fvARB_remap_index]
-#define _gloffset_Uniform2iARB driDispatchRemapTable[Uniform2iARB_remap_index]
-#define _gloffset_Uniform2ivARB driDispatchRemapTable[Uniform2ivARB_remap_index]
-#define _gloffset_Uniform3fARB driDispatchRemapTable[Uniform3fARB_remap_index]
-#define _gloffset_Uniform3fvARB driDispatchRemapTable[Uniform3fvARB_remap_index]
-#define _gloffset_Uniform3iARB driDispatchRemapTable[Uniform3iARB_remap_index]
-#define _gloffset_Uniform3ivARB driDispatchRemapTable[Uniform3ivARB_remap_index]
-#define _gloffset_Uniform4fARB driDispatchRemapTable[Uniform4fARB_remap_index]
-#define _gloffset_Uniform4fvARB driDispatchRemapTable[Uniform4fvARB_remap_index]
-#define _gloffset_Uniform4iARB driDispatchRemapTable[Uniform4iARB_remap_index]
-#define _gloffset_Uniform4ivARB driDispatchRemapTable[Uniform4ivARB_remap_index]
-#define _gloffset_UniformMatrix2fvARB driDispatchRemapTable[UniformMatrix2fvARB_remap_index]
-#define _gloffset_UniformMatrix3fvARB driDispatchRemapTable[UniformMatrix3fvARB_remap_index]
-#define _gloffset_UniformMatrix4fvARB driDispatchRemapTable[UniformMatrix4fvARB_remap_index]
-#define _gloffset_UseProgramObjectARB driDispatchRemapTable[UseProgramObjectARB_remap_index]
-#define _gloffset_ValidateProgramARB driDispatchRemapTable[ValidateProgramARB_remap_index]
-#define _gloffset_BindAttribLocationARB driDispatchRemapTable[BindAttribLocationARB_remap_index]
-#define _gloffset_GetActiveAttribARB driDispatchRemapTable[GetActiveAttribARB_remap_index]
-#define _gloffset_GetAttribLocationARB driDispatchRemapTable[GetAttribLocationARB_remap_index]
-#define _gloffset_DrawBuffersARB driDispatchRemapTable[DrawBuffersARB_remap_index]
-#define _gloffset_ClampColorARB driDispatchRemapTable[ClampColorARB_remap_index]
-#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]
-#define _gloffset_TexBufferARB driDispatchRemapTable[TexBufferARB_remap_index]
-#define _gloffset_BindVertexArray driDispatchRemapTable[BindVertexArray_remap_index]
-#define _gloffset_GenVertexArrays driDispatchRemapTable[GenVertexArrays_remap_index]
-#define _gloffset_CopyBufferSubData driDispatchRemapTable[CopyBufferSubData_remap_index]
-#define _gloffset_ClientWaitSync driDispatchRemapTable[ClientWaitSync_remap_index]
-#define _gloffset_DeleteSync driDispatchRemapTable[DeleteSync_remap_index]
-#define _gloffset_FenceSync driDispatchRemapTable[FenceSync_remap_index]
-#define _gloffset_GetInteger64v driDispatchRemapTable[GetInteger64v_remap_index]
-#define _gloffset_GetSynciv driDispatchRemapTable[GetSynciv_remap_index]
-#define _gloffset_IsSync driDispatchRemapTable[IsSync_remap_index]
-#define _gloffset_WaitSync driDispatchRemapTable[WaitSync_remap_index]
-#define _gloffset_DrawElementsBaseVertex driDispatchRemapTable[DrawElementsBaseVertex_remap_index]
-#define _gloffset_DrawElementsInstancedBaseVertex driDispatchRemapTable[DrawElementsInstancedBaseVertex_remap_index]
-#define _gloffset_DrawRangeElementsBaseVertex driDispatchRemapTable[DrawRangeElementsBaseVertex_remap_index]
-#define _gloffset_MultiDrawElementsBaseVertex driDispatchRemapTable[MultiDrawElementsBaseVertex_remap_index]
-#define _gloffset_BlendEquationSeparateiARB driDispatchRemapTable[BlendEquationSeparateiARB_remap_index]
-#define _gloffset_BlendEquationiARB driDispatchRemapTable[BlendEquationiARB_remap_index]
-#define _gloffset_BlendFuncSeparateiARB driDispatchRemapTable[BlendFuncSeparateiARB_remap_index]
-#define _gloffset_BlendFunciARB driDispatchRemapTable[BlendFunciARB_remap_index]
-#define _gloffset_BindSampler driDispatchRemapTable[BindSampler_remap_index]
-#define _gloffset_DeleteSamplers driDispatchRemapTable[DeleteSamplers_remap_index]
-#define _gloffset_GenSamplers driDispatchRemapTable[GenSamplers_remap_index]
-#define _gloffset_GetSamplerParameterIiv driDispatchRemapTable[GetSamplerParameterIiv_remap_index]
-#define _gloffset_GetSamplerParameterIuiv driDispatchRemapTable[GetSamplerParameterIuiv_remap_index]
-#define _gloffset_GetSamplerParameterfv driDispatchRemapTable[GetSamplerParameterfv_remap_index]
-#define _gloffset_GetSamplerParameteriv driDispatchRemapTable[GetSamplerParameteriv_remap_index]
-#define _gloffset_IsSampler driDispatchRemapTable[IsSampler_remap_index]
-#define _gloffset_SamplerParameterIiv driDispatchRemapTable[SamplerParameterIiv_remap_index]
-#define _gloffset_SamplerParameterIuiv driDispatchRemapTable[SamplerParameterIuiv_remap_index]
-#define _gloffset_SamplerParameterf driDispatchRemapTable[SamplerParameterf_remap_index]
-#define _gloffset_SamplerParameterfv driDispatchRemapTable[SamplerParameterfv_remap_index]
-#define _gloffset_SamplerParameteri driDispatchRemapTable[SamplerParameteri_remap_index]
-#define _gloffset_SamplerParameteriv driDispatchRemapTable[SamplerParameteriv_remap_index]
-#define _gloffset_ColorP3ui driDispatchRemapTable[ColorP3ui_remap_index]
-#define _gloffset_ColorP3uiv driDispatchRemapTable[ColorP3uiv_remap_index]
-#define _gloffset_ColorP4ui driDispatchRemapTable[ColorP4ui_remap_index]
-#define _gloffset_ColorP4uiv driDispatchRemapTable[ColorP4uiv_remap_index]
-#define _gloffset_MultiTexCoordP1ui driDispatchRemapTable[MultiTexCoordP1ui_remap_index]
-#define _gloffset_MultiTexCoordP1uiv driDispatchRemapTable[MultiTexCoordP1uiv_remap_index]
-#define _gloffset_MultiTexCoordP2ui driDispatchRemapTable[MultiTexCoordP2ui_remap_index]
-#define _gloffset_MultiTexCoordP2uiv driDispatchRemapTable[MultiTexCoordP2uiv_remap_index]
-#define _gloffset_MultiTexCoordP3ui driDispatchRemapTable[MultiTexCoordP3ui_remap_index]
-#define _gloffset_MultiTexCoordP3uiv driDispatchRemapTable[MultiTexCoordP3uiv_remap_index]
-#define _gloffset_MultiTexCoordP4ui driDispatchRemapTable[MultiTexCoordP4ui_remap_index]
-#define _gloffset_MultiTexCoordP4uiv driDispatchRemapTable[MultiTexCoordP4uiv_remap_index]
-#define _gloffset_NormalP3ui driDispatchRemapTable[NormalP3ui_remap_index]
-#define _gloffset_NormalP3uiv driDispatchRemapTable[NormalP3uiv_remap_index]
-#define _gloffset_SecondaryColorP3ui driDispatchRemapTable[SecondaryColorP3ui_remap_index]
-#define _gloffset_SecondaryColorP3uiv driDispatchRemapTable[SecondaryColorP3uiv_remap_index]
-#define _gloffset_TexCoordP1ui driDispatchRemapTable[TexCoordP1ui_remap_index]
-#define _gloffset_TexCoordP1uiv driDispatchRemapTable[TexCoordP1uiv_remap_index]
-#define _gloffset_TexCoordP2ui driDispatchRemapTable[TexCoordP2ui_remap_index]
-#define _gloffset_TexCoordP2uiv driDispatchRemapTable[TexCoordP2uiv_remap_index]
-#define _gloffset_TexCoordP3ui driDispatchRemapTable[TexCoordP3ui_remap_index]
-#define _gloffset_TexCoordP3uiv driDispatchRemapTable[TexCoordP3uiv_remap_index]
-#define _gloffset_TexCoordP4ui driDispatchRemapTable[TexCoordP4ui_remap_index]
-#define _gloffset_TexCoordP4uiv driDispatchRemapTable[TexCoordP4uiv_remap_index]
-#define _gloffset_VertexAttribP1ui driDispatchRemapTable[VertexAttribP1ui_remap_index]
-#define _gloffset_VertexAttribP1uiv driDispatchRemapTable[VertexAttribP1uiv_remap_index]
-#define _gloffset_VertexAttribP2ui driDispatchRemapTable[VertexAttribP2ui_remap_index]
-#define _gloffset_VertexAttribP2uiv driDispatchRemapTable[VertexAttribP2uiv_remap_index]
-#define _gloffset_VertexAttribP3ui driDispatchRemapTable[VertexAttribP3ui_remap_index]
-#define _gloffset_VertexAttribP3uiv driDispatchRemapTable[VertexAttribP3uiv_remap_index]
-#define _gloffset_VertexAttribP4ui driDispatchRemapTable[VertexAttribP4ui_remap_index]
-#define _gloffset_VertexAttribP4uiv driDispatchRemapTable[VertexAttribP4uiv_remap_index]
-#define _gloffset_VertexP2ui driDispatchRemapTable[VertexP2ui_remap_index]
-#define _gloffset_VertexP2uiv driDispatchRemapTable[VertexP2uiv_remap_index]
-#define _gloffset_VertexP3ui driDispatchRemapTable[VertexP3ui_remap_index]
-#define _gloffset_VertexP3uiv driDispatchRemapTable[VertexP3uiv_remap_index]
-#define _gloffset_VertexP4ui driDispatchRemapTable[VertexP4ui_remap_index]
-#define _gloffset_VertexP4uiv driDispatchRemapTable[VertexP4uiv_remap_index]
-#define _gloffset_BindTransformFeedback driDispatchRemapTable[BindTransformFeedback_remap_index]
-#define _gloffset_DeleteTransformFeedbacks driDispatchRemapTable[DeleteTransformFeedbacks_remap_index]
-#define _gloffset_DrawTransformFeedback driDispatchRemapTable[DrawTransformFeedback_remap_index]
-#define _gloffset_GenTransformFeedbacks driDispatchRemapTable[GenTransformFeedbacks_remap_index]
-#define _gloffset_IsTransformFeedback driDispatchRemapTable[IsTransformFeedback_remap_index]
-#define _gloffset_PauseTransformFeedback driDispatchRemapTable[PauseTransformFeedback_remap_index]
-#define _gloffset_ResumeTransformFeedback driDispatchRemapTable[ResumeTransformFeedback_remap_index]
-#define _gloffset_ClearDepthf driDispatchRemapTable[ClearDepthf_remap_index]
-#define _gloffset_DepthRangef driDispatchRemapTable[DepthRangef_remap_index]
-#define _gloffset_GetShaderPrecisionFormat driDispatchRemapTable[GetShaderPrecisionFormat_remap_index]
-#define _gloffset_ReleaseShaderCompiler driDispatchRemapTable[ReleaseShaderCompiler_remap_index]
-#define _gloffset_ShaderBinary driDispatchRemapTable[ShaderBinary_remap_index]
-#define _gloffset_GetGraphicsResetStatusARB driDispatchRemapTable[GetGraphicsResetStatusARB_remap_index]
-#define _gloffset_GetnColorTableARB driDispatchRemapTable[GetnColorTableARB_remap_index]
-#define _gloffset_GetnCompressedTexImageARB driDispatchRemapTable[GetnCompressedTexImageARB_remap_index]
-#define _gloffset_GetnConvolutionFilterARB driDispatchRemapTable[GetnConvolutionFilterARB_remap_index]
-#define _gloffset_GetnHistogramARB driDispatchRemapTable[GetnHistogramARB_remap_index]
-#define _gloffset_GetnMapdvARB driDispatchRemapTable[GetnMapdvARB_remap_index]
-#define _gloffset_GetnMapfvARB driDispatchRemapTable[GetnMapfvARB_remap_index]
-#define _gloffset_GetnMapivARB driDispatchRemapTable[GetnMapivARB_remap_index]
-#define _gloffset_GetnMinmaxARB driDispatchRemapTable[GetnMinmaxARB_remap_index]
-#define _gloffset_GetnPixelMapfvARB driDispatchRemapTable[GetnPixelMapfvARB_remap_index]
-#define _gloffset_GetnPixelMapuivARB driDispatchRemapTable[GetnPixelMapuivARB_remap_index]
-#define _gloffset_GetnPixelMapusvARB driDispatchRemapTable[GetnPixelMapusvARB_remap_index]
-#define _gloffset_GetnPolygonStippleARB driDispatchRemapTable[GetnPolygonStippleARB_remap_index]
-#define _gloffset_GetnSeparableFilterARB driDispatchRemapTable[GetnSeparableFilterARB_remap_index]
-#define _gloffset_GetnTexImageARB driDispatchRemapTable[GetnTexImageARB_remap_index]
-#define _gloffset_GetnUniformdvARB driDispatchRemapTable[GetnUniformdvARB_remap_index]
-#define _gloffset_GetnUniformfvARB driDispatchRemapTable[GetnUniformfvARB_remap_index]
-#define _gloffset_GetnUniformivARB driDispatchRemapTable[GetnUniformivARB_remap_index]
-#define _gloffset_GetnUniformuivARB driDispatchRemapTable[GetnUniformuivARB_remap_index]
-#define _gloffset_ReadnPixelsARB driDispatchRemapTable[ReadnPixelsARB_remap_index]
-#define _gloffset_TexStorage1D driDispatchRemapTable[TexStorage1D_remap_index]
-#define _gloffset_TexStorage2D driDispatchRemapTable[TexStorage2D_remap_index]
-#define _gloffset_TexStorage3D driDispatchRemapTable[TexStorage3D_remap_index]
-#define _gloffset_TextureStorage1DEXT driDispatchRemapTable[TextureStorage1DEXT_remap_index]
-#define _gloffset_TextureStorage2DEXT driDispatchRemapTable[TextureStorage2DEXT_remap_index]
-#define _gloffset_TextureStorage3DEXT driDispatchRemapTable[TextureStorage3DEXT_remap_index]
-#define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index]
-#define _gloffset_GetPixelTexGenParameterfvSGIS driDispatchRemapTable[GetPixelTexGenParameterfvSGIS_remap_index]
-#define _gloffset_GetPixelTexGenParameterivSGIS driDispatchRemapTable[GetPixelTexGenParameterivSGIS_remap_index]
-#define _gloffset_PixelTexGenParameterfSGIS driDispatchRemapTable[PixelTexGenParameterfSGIS_remap_index]
-#define _gloffset_PixelTexGenParameterfvSGIS driDispatchRemapTable[PixelTexGenParameterfvSGIS_remap_index]
-#define _gloffset_PixelTexGenParameteriSGIS driDispatchRemapTable[PixelTexGenParameteriSGIS_remap_index]
-#define _gloffset_PixelTexGenParameterivSGIS driDispatchRemapTable[PixelTexGenParameterivSGIS_remap_index]
-#define _gloffset_SampleMaskSGIS driDispatchRemapTable[SampleMaskSGIS_remap_index]
-#define _gloffset_SamplePatternSGIS driDispatchRemapTable[SamplePatternSGIS_remap_index]
-#define _gloffset_ColorPointerEXT driDispatchRemapTable[ColorPointerEXT_remap_index]
-#define _gloffset_EdgeFlagPointerEXT driDispatchRemapTable[EdgeFlagPointerEXT_remap_index]
-#define _gloffset_IndexPointerEXT driDispatchRemapTable[IndexPointerEXT_remap_index]
-#define _gloffset_NormalPointerEXT driDispatchRemapTable[NormalPointerEXT_remap_index]
-#define _gloffset_TexCoordPointerEXT driDispatchRemapTable[TexCoordPointerEXT_remap_index]
-#define _gloffset_VertexPointerEXT driDispatchRemapTable[VertexPointerEXT_remap_index]
-#define _gloffset_PointParameterfEXT driDispatchRemapTable[PointParameterfEXT_remap_index]
-#define _gloffset_PointParameterfvEXT driDispatchRemapTable[PointParameterfvEXT_remap_index]
-#define _gloffset_LockArraysEXT driDispatchRemapTable[LockArraysEXT_remap_index]
-#define _gloffset_UnlockArraysEXT driDispatchRemapTable[UnlockArraysEXT_remap_index]
-#define _gloffset_SecondaryColor3bEXT driDispatchRemapTable[SecondaryColor3bEXT_remap_index]
-#define _gloffset_SecondaryColor3bvEXT driDispatchRemapTable[SecondaryColor3bvEXT_remap_index]
-#define _gloffset_SecondaryColor3dEXT driDispatchRemapTable[SecondaryColor3dEXT_remap_index]
-#define _gloffset_SecondaryColor3dvEXT driDispatchRemapTable[SecondaryColor3dvEXT_remap_index]
-#define _gloffset_SecondaryColor3fEXT driDispatchRemapTable[SecondaryColor3fEXT_remap_index]
-#define _gloffset_SecondaryColor3fvEXT driDispatchRemapTable[SecondaryColor3fvEXT_remap_index]
-#define _gloffset_SecondaryColor3iEXT driDispatchRemapTable[SecondaryColor3iEXT_remap_index]
-#define _gloffset_SecondaryColor3ivEXT driDispatchRemapTable[SecondaryColor3ivEXT_remap_index]
-#define _gloffset_SecondaryColor3sEXT driDispatchRemapTable[SecondaryColor3sEXT_remap_index]
-#define _gloffset_SecondaryColor3svEXT driDispatchRemapTable[SecondaryColor3svEXT_remap_index]
-#define _gloffset_SecondaryColor3ubEXT driDispatchRemapTable[SecondaryColor3ubEXT_remap_index]
-#define _gloffset_SecondaryColor3ubvEXT driDispatchRemapTable[SecondaryColor3ubvEXT_remap_index]
-#define _gloffset_SecondaryColor3uiEXT driDispatchRemapTable[SecondaryColor3uiEXT_remap_index]
-#define _gloffset_SecondaryColor3uivEXT driDispatchRemapTable[SecondaryColor3uivEXT_remap_index]
-#define _gloffset_SecondaryColor3usEXT driDispatchRemapTable[SecondaryColor3usEXT_remap_index]
-#define _gloffset_SecondaryColor3usvEXT driDispatchRemapTable[SecondaryColor3usvEXT_remap_index]
-#define _gloffset_SecondaryColorPointerEXT driDispatchRemapTable[SecondaryColorPointerEXT_remap_index]
-#define _gloffset_MultiDrawArraysEXT driDispatchRemapTable[MultiDrawArraysEXT_remap_index]
-#define _gloffset_MultiDrawElementsEXT driDispatchRemapTable[MultiDrawElementsEXT_remap_index]
-#define _gloffset_FogCoordPointerEXT driDispatchRemapTable[FogCoordPointerEXT_remap_index]
-#define _gloffset_FogCoorddEXT driDispatchRemapTable[FogCoorddEXT_remap_index]
-#define _gloffset_FogCoorddvEXT driDispatchRemapTable[FogCoorddvEXT_remap_index]
-#define _gloffset_FogCoordfEXT driDispatchRemapTable[FogCoordfEXT_remap_index]
-#define _gloffset_FogCoordfvEXT driDispatchRemapTable[FogCoordfvEXT_remap_index]
-#define _gloffset_PixelTexGenSGIX driDispatchRemapTable[PixelTexGenSGIX_remap_index]
-#define _gloffset_BlendFuncSeparateEXT driDispatchRemapTable[BlendFuncSeparateEXT_remap_index]
-#define _gloffset_FlushVertexArrayRangeNV driDispatchRemapTable[FlushVertexArrayRangeNV_remap_index]
-#define _gloffset_VertexArrayRangeNV driDispatchRemapTable[VertexArrayRangeNV_remap_index]
-#define _gloffset_CombinerInputNV driDispatchRemapTable[CombinerInputNV_remap_index]
-#define _gloffset_CombinerOutputNV driDispatchRemapTable[CombinerOutputNV_remap_index]
-#define _gloffset_CombinerParameterfNV driDispatchRemapTable[CombinerParameterfNV_remap_index]
-#define _gloffset_CombinerParameterfvNV driDispatchRemapTable[CombinerParameterfvNV_remap_index]
-#define _gloffset_CombinerParameteriNV driDispatchRemapTable[CombinerParameteriNV_remap_index]
-#define _gloffset_CombinerParameterivNV driDispatchRemapTable[CombinerParameterivNV_remap_index]
-#define _gloffset_FinalCombinerInputNV driDispatchRemapTable[FinalCombinerInputNV_remap_index]
-#define _gloffset_GetCombinerInputParameterfvNV driDispatchRemapTable[GetCombinerInputParameterfvNV_remap_index]
-#define _gloffset_GetCombinerInputParameterivNV driDispatchRemapTable[GetCombinerInputParameterivNV_remap_index]
-#define _gloffset_GetCombinerOutputParameterfvNV driDispatchRemapTable[GetCombinerOutputParameterfvNV_remap_index]
-#define _gloffset_GetCombinerOutputParameterivNV driDispatchRemapTable[GetCombinerOutputParameterivNV_remap_index]
-#define _gloffset_GetFinalCombinerInputParameterfvNV driDispatchRemapTable[GetFinalCombinerInputParameterfvNV_remap_index]
-#define _gloffset_GetFinalCombinerInputParameterivNV driDispatchRemapTable[GetFinalCombinerInputParameterivNV_remap_index]
-#define _gloffset_ResizeBuffersMESA driDispatchRemapTable[ResizeBuffersMESA_remap_index]
-#define _gloffset_WindowPos2dMESA driDispatchRemapTable[WindowPos2dMESA_remap_index]
-#define _gloffset_WindowPos2dvMESA driDispatchRemapTable[WindowPos2dvMESA_remap_index]
-#define _gloffset_WindowPos2fMESA driDispatchRemapTable[WindowPos2fMESA_remap_index]
-#define _gloffset_WindowPos2fvMESA driDispatchRemapTable[WindowPos2fvMESA_remap_index]
-#define _gloffset_WindowPos2iMESA driDispatchRemapTable[WindowPos2iMESA_remap_index]
-#define _gloffset_WindowPos2ivMESA driDispatchRemapTable[WindowPos2ivMESA_remap_index]
-#define _gloffset_WindowPos2sMESA driDispatchRemapTable[WindowPos2sMESA_remap_index]
-#define _gloffset_WindowPos2svMESA driDispatchRemapTable[WindowPos2svMESA_remap_index]
-#define _gloffset_WindowPos3dMESA driDispatchRemapTable[WindowPos3dMESA_remap_index]
-#define _gloffset_WindowPos3dvMESA driDispatchRemapTable[WindowPos3dvMESA_remap_index]
-#define _gloffset_WindowPos3fMESA driDispatchRemapTable[WindowPos3fMESA_remap_index]
-#define _gloffset_WindowPos3fvMESA driDispatchRemapTable[WindowPos3fvMESA_remap_index]
-#define _gloffset_WindowPos3iMESA driDispatchRemapTable[WindowPos3iMESA_remap_index]
-#define _gloffset_WindowPos3ivMESA driDispatchRemapTable[WindowPos3ivMESA_remap_index]
-#define _gloffset_WindowPos3sMESA driDispatchRemapTable[WindowPos3sMESA_remap_index]
-#define _gloffset_WindowPos3svMESA driDispatchRemapTable[WindowPos3svMESA_remap_index]
-#define _gloffset_WindowPos4dMESA driDispatchRemapTable[WindowPos4dMESA_remap_index]
-#define _gloffset_WindowPos4dvMESA driDispatchRemapTable[WindowPos4dvMESA_remap_index]
-#define _gloffset_WindowPos4fMESA driDispatchRemapTable[WindowPos4fMESA_remap_index]
-#define _gloffset_WindowPos4fvMESA driDispatchRemapTable[WindowPos4fvMESA_remap_index]
-#define _gloffset_WindowPos4iMESA driDispatchRemapTable[WindowPos4iMESA_remap_index]
-#define _gloffset_WindowPos4ivMESA driDispatchRemapTable[WindowPos4ivMESA_remap_index]
-#define _gloffset_WindowPos4sMESA driDispatchRemapTable[WindowPos4sMESA_remap_index]
-#define _gloffset_WindowPos4svMESA driDispatchRemapTable[WindowPos4svMESA_remap_index]
-#define _gloffset_MultiModeDrawArraysIBM driDispatchRemapTable[MultiModeDrawArraysIBM_remap_index]
-#define _gloffset_MultiModeDrawElementsIBM driDispatchRemapTable[MultiModeDrawElementsIBM_remap_index]
-#define _gloffset_DeleteFencesNV driDispatchRemapTable[DeleteFencesNV_remap_index]
-#define _gloffset_FinishFenceNV driDispatchRemapTable[FinishFenceNV_remap_index]
-#define _gloffset_GenFencesNV driDispatchRemapTable[GenFencesNV_remap_index]
-#define _gloffset_GetFenceivNV driDispatchRemapTable[GetFenceivNV_remap_index]
-#define _gloffset_IsFenceNV driDispatchRemapTable[IsFenceNV_remap_index]
-#define _gloffset_SetFenceNV driDispatchRemapTable[SetFenceNV_remap_index]
-#define _gloffset_TestFenceNV driDispatchRemapTable[TestFenceNV_remap_index]
-#define _gloffset_AreProgramsResidentNV driDispatchRemapTable[AreProgramsResidentNV_remap_index]
-#define _gloffset_BindProgramNV driDispatchRemapTable[BindProgramNV_remap_index]
-#define _gloffset_DeleteProgramsNV driDispatchRemapTable[DeleteProgramsNV_remap_index]
-#define _gloffset_ExecuteProgramNV driDispatchRemapTable[ExecuteProgramNV_remap_index]
-#define _gloffset_GenProgramsNV driDispatchRemapTable[GenProgramsNV_remap_index]
-#define _gloffset_GetProgramParameterdvNV driDispatchRemapTable[GetProgramParameterdvNV_remap_index]
-#define _gloffset_GetProgramParameterfvNV driDispatchRemapTable[GetProgramParameterfvNV_remap_index]
-#define _gloffset_GetProgramStringNV driDispatchRemapTable[GetProgramStringNV_remap_index]
-#define _gloffset_GetProgramivNV driDispatchRemapTable[GetProgramivNV_remap_index]
-#define _gloffset_GetTrackMatrixivNV driDispatchRemapTable[GetTrackMatrixivNV_remap_index]
-#define _gloffset_GetVertexAttribPointervNV driDispatchRemapTable[GetVertexAttribPointervNV_remap_index]
-#define _gloffset_GetVertexAttribdvNV driDispatchRemapTable[GetVertexAttribdvNV_remap_index]
-#define _gloffset_GetVertexAttribfvNV driDispatchRemapTable[GetVertexAttribfvNV_remap_index]
-#define _gloffset_GetVertexAttribivNV driDispatchRemapTable[GetVertexAttribivNV_remap_index]
-#define _gloffset_IsProgramNV driDispatchRemapTable[IsProgramNV_remap_index]
-#define _gloffset_LoadProgramNV driDispatchRemapTable[LoadProgramNV_remap_index]
-#define _gloffset_ProgramParameters4dvNV driDispatchRemapTable[ProgramParameters4dvNV_remap_index]
-#define _gloffset_ProgramParameters4fvNV driDispatchRemapTable[ProgramParameters4fvNV_remap_index]
-#define _gloffset_RequestResidentProgramsNV driDispatchRemapTable[RequestResidentProgramsNV_remap_index]
-#define _gloffset_TrackMatrixNV driDispatchRemapTable[TrackMatrixNV_remap_index]
-#define _gloffset_VertexAttrib1dNV driDispatchRemapTable[VertexAttrib1dNV_remap_index]
-#define _gloffset_VertexAttrib1dvNV driDispatchRemapTable[VertexAttrib1dvNV_remap_index]
-#define _gloffset_VertexAttrib1fNV driDispatchRemapTable[VertexAttrib1fNV_remap_index]
-#define _gloffset_VertexAttrib1fvNV driDispatchRemapTable[VertexAttrib1fvNV_remap_index]
-#define _gloffset_VertexAttrib1sNV driDispatchRemapTable[VertexAttrib1sNV_remap_index]
-#define _gloffset_VertexAttrib1svNV driDispatchRemapTable[VertexAttrib1svNV_remap_index]
-#define _gloffset_VertexAttrib2dNV driDispatchRemapTable[VertexAttrib2dNV_remap_index]
-#define _gloffset_VertexAttrib2dvNV driDispatchRemapTable[VertexAttrib2dvNV_remap_index]
-#define _gloffset_VertexAttrib2fNV driDispatchRemapTable[VertexAttrib2fNV_remap_index]
-#define _gloffset_VertexAttrib2fvNV driDispatchRemapTable[VertexAttrib2fvNV_remap_index]
-#define _gloffset_VertexAttrib2sNV driDispatchRemapTable[VertexAttrib2sNV_remap_index]
-#define _gloffset_VertexAttrib2svNV driDispatchRemapTable[VertexAttrib2svNV_remap_index]
-#define _gloffset_VertexAttrib3dNV driDispatchRemapTable[VertexAttrib3dNV_remap_index]
-#define _gloffset_VertexAttrib3dvNV driDispatchRemapTable[VertexAttrib3dvNV_remap_index]
-#define _gloffset_VertexAttrib3fNV driDispatchRemapTable[VertexAttrib3fNV_remap_index]
-#define _gloffset_VertexAttrib3fvNV driDispatchRemapTable[VertexAttrib3fvNV_remap_index]
-#define _gloffset_VertexAttrib3sNV driDispatchRemapTable[VertexAttrib3sNV_remap_index]
-#define _gloffset_VertexAttrib3svNV driDispatchRemapTable[VertexAttrib3svNV_remap_index]
-#define _gloffset_VertexAttrib4dNV driDispatchRemapTable[VertexAttrib4dNV_remap_index]
-#define _gloffset_VertexAttrib4dvNV driDispatchRemapTable[VertexAttrib4dvNV_remap_index]
-#define _gloffset_VertexAttrib4fNV driDispatchRemapTable[VertexAttrib4fNV_remap_index]
-#define _gloffset_VertexAttrib4fvNV driDispatchRemapTable[VertexAttrib4fvNV_remap_index]
-#define _gloffset_VertexAttrib4sNV driDispatchRemapTable[VertexAttrib4sNV_remap_index]
-#define _gloffset_VertexAttrib4svNV driDispatchRemapTable[VertexAttrib4svNV_remap_index]
-#define _gloffset_VertexAttrib4ubNV driDispatchRemapTable[VertexAttrib4ubNV_remap_index]
-#define _gloffset_VertexAttrib4ubvNV driDispatchRemapTable[VertexAttrib4ubvNV_remap_index]
-#define _gloffset_VertexAttribPointerNV driDispatchRemapTable[VertexAttribPointerNV_remap_index]
-#define _gloffset_VertexAttribs1dvNV driDispatchRemapTable[VertexAttribs1dvNV_remap_index]
-#define _gloffset_VertexAttribs1fvNV driDispatchRemapTable[VertexAttribs1fvNV_remap_index]
-#define _gloffset_VertexAttribs1svNV driDispatchRemapTable[VertexAttribs1svNV_remap_index]
-#define _gloffset_VertexAttribs2dvNV driDispatchRemapTable[VertexAttribs2dvNV_remap_index]
-#define _gloffset_VertexAttribs2fvNV driDispatchRemapTable[VertexAttribs2fvNV_remap_index]
-#define _gloffset_VertexAttribs2svNV driDispatchRemapTable[VertexAttribs2svNV_remap_index]
-#define _gloffset_VertexAttribs3dvNV driDispatchRemapTable[VertexAttribs3dvNV_remap_index]
-#define _gloffset_VertexAttribs3fvNV driDispatchRemapTable[VertexAttribs3fvNV_remap_index]
-#define _gloffset_VertexAttribs3svNV driDispatchRemapTable[VertexAttribs3svNV_remap_index]
-#define _gloffset_VertexAttribs4dvNV driDispatchRemapTable[VertexAttribs4dvNV_remap_index]
-#define _gloffset_VertexAttribs4fvNV driDispatchRemapTable[VertexAttribs4fvNV_remap_index]
-#define _gloffset_VertexAttribs4svNV driDispatchRemapTable[VertexAttribs4svNV_remap_index]
-#define _gloffset_VertexAttribs4ubvNV driDispatchRemapTable[VertexAttribs4ubvNV_remap_index]
-#define _gloffset_GetTexBumpParameterfvATI driDispatchRemapTable[GetTexBumpParameterfvATI_remap_index]
-#define _gloffset_GetTexBumpParameterivATI driDispatchRemapTable[GetTexBumpParameterivATI_remap_index]
-#define _gloffset_TexBumpParameterfvATI driDispatchRemapTable[TexBumpParameterfvATI_remap_index]
-#define _gloffset_TexBumpParameterivATI driDispatchRemapTable[TexBumpParameterivATI_remap_index]
-#define _gloffset_AlphaFragmentOp1ATI driDispatchRemapTable[AlphaFragmentOp1ATI_remap_index]
-#define _gloffset_AlphaFragmentOp2ATI driDispatchRemapTable[AlphaFragmentOp2ATI_remap_index]
-#define _gloffset_AlphaFragmentOp3ATI driDispatchRemapTable[AlphaFragmentOp3ATI_remap_index]
-#define _gloffset_BeginFragmentShaderATI driDispatchRemapTable[BeginFragmentShaderATI_remap_index]
-#define _gloffset_BindFragmentShaderATI driDispatchRemapTable[BindFragmentShaderATI_remap_index]
-#define _gloffset_ColorFragmentOp1ATI driDispatchRemapTable[ColorFragmentOp1ATI_remap_index]
-#define _gloffset_ColorFragmentOp2ATI driDispatchRemapTable[ColorFragmentOp2ATI_remap_index]
-#define _gloffset_ColorFragmentOp3ATI driDispatchRemapTable[ColorFragmentOp3ATI_remap_index]
-#define _gloffset_DeleteFragmentShaderATI driDispatchRemapTable[DeleteFragmentShaderATI_remap_index]
-#define _gloffset_EndFragmentShaderATI driDispatchRemapTable[EndFragmentShaderATI_remap_index]
-#define _gloffset_GenFragmentShadersATI driDispatchRemapTable[GenFragmentShadersATI_remap_index]
-#define _gloffset_PassTexCoordATI driDispatchRemapTable[PassTexCoordATI_remap_index]
-#define _gloffset_SampleMapATI driDispatchRemapTable[SampleMapATI_remap_index]
-#define _gloffset_SetFragmentShaderConstantATI driDispatchRemapTable[SetFragmentShaderConstantATI_remap_index]
-#define _gloffset_PointParameteriNV driDispatchRemapTable[PointParameteriNV_remap_index]
-#define _gloffset_PointParameterivNV driDispatchRemapTable[PointParameterivNV_remap_index]
-#define _gloffset_ActiveStencilFaceEXT driDispatchRemapTable[ActiveStencilFaceEXT_remap_index]
-#define _gloffset_BindVertexArrayAPPLE driDispatchRemapTable[BindVertexArrayAPPLE_remap_index]
-#define _gloffset_DeleteVertexArraysAPPLE driDispatchRemapTable[DeleteVertexArraysAPPLE_remap_index]
-#define _gloffset_GenVertexArraysAPPLE driDispatchRemapTable[GenVertexArraysAPPLE_remap_index]
-#define _gloffset_IsVertexArrayAPPLE driDispatchRemapTable[IsVertexArrayAPPLE_remap_index]
-#define _gloffset_GetProgramNamedParameterdvNV driDispatchRemapTable[GetProgramNamedParameterdvNV_remap_index]
-#define _gloffset_GetProgramNamedParameterfvNV driDispatchRemapTable[GetProgramNamedParameterfvNV_remap_index]
-#define _gloffset_ProgramNamedParameter4dNV driDispatchRemapTable[ProgramNamedParameter4dNV_remap_index]
-#define _gloffset_ProgramNamedParameter4dvNV driDispatchRemapTable[ProgramNamedParameter4dvNV_remap_index]
-#define _gloffset_ProgramNamedParameter4fNV driDispatchRemapTable[ProgramNamedParameter4fNV_remap_index]
-#define _gloffset_ProgramNamedParameter4fvNV driDispatchRemapTable[ProgramNamedParameter4fvNV_remap_index]
-#define _gloffset_PrimitiveRestartIndexNV driDispatchRemapTable[PrimitiveRestartIndexNV_remap_index]
-#define _gloffset_PrimitiveRestartNV driDispatchRemapTable[PrimitiveRestartNV_remap_index]
-#define _gloffset_DepthBoundsEXT driDispatchRemapTable[DepthBoundsEXT_remap_index]
-#define _gloffset_BlendEquationSeparateEXT driDispatchRemapTable[BlendEquationSeparateEXT_remap_index]
-#define _gloffset_BindFramebufferEXT driDispatchRemapTable[BindFramebufferEXT_remap_index]
-#define _gloffset_BindRenderbufferEXT driDispatchRemapTable[BindRenderbufferEXT_remap_index]
-#define _gloffset_CheckFramebufferStatusEXT driDispatchRemapTable[CheckFramebufferStatusEXT_remap_index]
-#define _gloffset_DeleteFramebuffersEXT driDispatchRemapTable[DeleteFramebuffersEXT_remap_index]
-#define _gloffset_DeleteRenderbuffersEXT driDispatchRemapTable[DeleteRenderbuffersEXT_remap_index]
-#define _gloffset_FramebufferRenderbufferEXT driDispatchRemapTable[FramebufferRenderbufferEXT_remap_index]
-#define _gloffset_FramebufferTexture1DEXT driDispatchRemapTable[FramebufferTexture1DEXT_remap_index]
-#define _gloffset_FramebufferTexture2DEXT driDispatchRemapTable[FramebufferTexture2DEXT_remap_index]
-#define _gloffset_FramebufferTexture3DEXT driDispatchRemapTable[FramebufferTexture3DEXT_remap_index]
-#define _gloffset_GenFramebuffersEXT driDispatchRemapTable[GenFramebuffersEXT_remap_index]
-#define _gloffset_GenRenderbuffersEXT driDispatchRemapTable[GenRenderbuffersEXT_remap_index]
-#define _gloffset_GenerateMipmapEXT driDispatchRemapTable[GenerateMipmapEXT_remap_index]
-#define _gloffset_GetFramebufferAttachmentParameterivEXT driDispatchRemapTable[GetFramebufferAttachmentParameterivEXT_remap_index]
-#define _gloffset_GetRenderbufferParameterivEXT driDispatchRemapTable[GetRenderbufferParameterivEXT_remap_index]
-#define _gloffset_IsFramebufferEXT driDispatchRemapTable[IsFramebufferEXT_remap_index]
-#define _gloffset_IsRenderbufferEXT driDispatchRemapTable[IsRenderbufferEXT_remap_index]
-#define _gloffset_RenderbufferStorageEXT driDispatchRemapTable[RenderbufferStorageEXT_remap_index]
-#define _gloffset_BlitFramebufferEXT driDispatchRemapTable[BlitFramebufferEXT_remap_index]
-#define _gloffset_BufferParameteriAPPLE driDispatchRemapTable[BufferParameteriAPPLE_remap_index]
-#define _gloffset_FlushMappedBufferRangeAPPLE driDispatchRemapTable[FlushMappedBufferRangeAPPLE_remap_index]
-#define _gloffset_BindFragDataLocationEXT driDispatchRemapTable[BindFragDataLocationEXT_remap_index]
-#define _gloffset_GetFragDataLocationEXT driDispatchRemapTable[GetFragDataLocationEXT_remap_index]
-#define _gloffset_GetUniformuivEXT driDispatchRemapTable[GetUniformuivEXT_remap_index]
-#define _gloffset_GetVertexAttribIivEXT driDispatchRemapTable[GetVertexAttribIivEXT_remap_index]
-#define _gloffset_GetVertexAttribIuivEXT driDispatchRemapTable[GetVertexAttribIuivEXT_remap_index]
-#define _gloffset_Uniform1uiEXT driDispatchRemapTable[Uniform1uiEXT_remap_index]
-#define _gloffset_Uniform1uivEXT driDispatchRemapTable[Uniform1uivEXT_remap_index]
-#define _gloffset_Uniform2uiEXT driDispatchRemapTable[Uniform2uiEXT_remap_index]
-#define _gloffset_Uniform2uivEXT driDispatchRemapTable[Uniform2uivEXT_remap_index]
-#define _gloffset_Uniform3uiEXT driDispatchRemapTable[Uniform3uiEXT_remap_index]
-#define _gloffset_Uniform3uivEXT driDispatchRemapTable[Uniform3uivEXT_remap_index]
-#define _gloffset_Uniform4uiEXT driDispatchRemapTable[Uniform4uiEXT_remap_index]
-#define _gloffset_Uniform4uivEXT driDispatchRemapTable[Uniform4uivEXT_remap_index]
-#define _gloffset_VertexAttribI1iEXT driDispatchRemapTable[VertexAttribI1iEXT_remap_index]
-#define _gloffset_VertexAttribI1ivEXT driDispatchRemapTable[VertexAttribI1ivEXT_remap_index]
-#define _gloffset_VertexAttribI1uiEXT driDispatchRemapTable[VertexAttribI1uiEXT_remap_index]
-#define _gloffset_VertexAttribI1uivEXT driDispatchRemapTable[VertexAttribI1uivEXT_remap_index]
-#define _gloffset_VertexAttribI2iEXT driDispatchRemapTable[VertexAttribI2iEXT_remap_index]
-#define _gloffset_VertexAttribI2ivEXT driDispatchRemapTable[VertexAttribI2ivEXT_remap_index]
-#define _gloffset_VertexAttribI2uiEXT driDispatchRemapTable[VertexAttribI2uiEXT_remap_index]
-#define _gloffset_VertexAttribI2uivEXT driDispatchRemapTable[VertexAttribI2uivEXT_remap_index]
-#define _gloffset_VertexAttribI3iEXT driDispatchRemapTable[VertexAttribI3iEXT_remap_index]
-#define _gloffset_VertexAttribI3ivEXT driDispatchRemapTable[VertexAttribI3ivEXT_remap_index]
-#define _gloffset_VertexAttribI3uiEXT driDispatchRemapTable[VertexAttribI3uiEXT_remap_index]
-#define _gloffset_VertexAttribI3uivEXT driDispatchRemapTable[VertexAttribI3uivEXT_remap_index]
-#define _gloffset_VertexAttribI4bvEXT driDispatchRemapTable[VertexAttribI4bvEXT_remap_index]
-#define _gloffset_VertexAttribI4iEXT driDispatchRemapTable[VertexAttribI4iEXT_remap_index]
-#define _gloffset_VertexAttribI4ivEXT driDispatchRemapTable[VertexAttribI4ivEXT_remap_index]
-#define _gloffset_VertexAttribI4svEXT driDispatchRemapTable[VertexAttribI4svEXT_remap_index]
-#define _gloffset_VertexAttribI4ubvEXT driDispatchRemapTable[VertexAttribI4ubvEXT_remap_index]
-#define _gloffset_VertexAttribI4uiEXT driDispatchRemapTable[VertexAttribI4uiEXT_remap_index]
-#define _gloffset_VertexAttribI4uivEXT driDispatchRemapTable[VertexAttribI4uivEXT_remap_index]
-#define _gloffset_VertexAttribI4usvEXT driDispatchRemapTable[VertexAttribI4usvEXT_remap_index]
-#define _gloffset_VertexAttribIPointerEXT driDispatchRemapTable[VertexAttribIPointerEXT_remap_index]
-#define _gloffset_FramebufferTextureLayerEXT driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index]
-#define _gloffset_ColorMaskIndexedEXT driDispatchRemapTable[ColorMaskIndexedEXT_remap_index]
-#define _gloffset_DisableIndexedEXT driDispatchRemapTable[DisableIndexedEXT_remap_index]
-#define _gloffset_EnableIndexedEXT driDispatchRemapTable[EnableIndexedEXT_remap_index]
-#define _gloffset_GetBooleanIndexedvEXT driDispatchRemapTable[GetBooleanIndexedvEXT_remap_index]
-#define _gloffset_GetIntegerIndexedvEXT driDispatchRemapTable[GetIntegerIndexedvEXT_remap_index]
-#define _gloffset_IsEnabledIndexedEXT driDispatchRemapTable[IsEnabledIndexedEXT_remap_index]
-#define _gloffset_ClearColorIiEXT driDispatchRemapTable[ClearColorIiEXT_remap_index]
-#define _gloffset_ClearColorIuiEXT driDispatchRemapTable[ClearColorIuiEXT_remap_index]
-#define _gloffset_GetTexParameterIivEXT driDispatchRemapTable[GetTexParameterIivEXT_remap_index]
-#define _gloffset_GetTexParameterIuivEXT driDispatchRemapTable[GetTexParameterIuivEXT_remap_index]
-#define _gloffset_TexParameterIivEXT driDispatchRemapTable[TexParameterIivEXT_remap_index]
-#define _gloffset_TexParameterIuivEXT driDispatchRemapTable[TexParameterIuivEXT_remap_index]
-#define _gloffset_BeginConditionalRenderNV driDispatchRemapTable[BeginConditionalRenderNV_remap_index]
-#define _gloffset_EndConditionalRenderNV driDispatchRemapTable[EndConditionalRenderNV_remap_index]
-#define _gloffset_BeginTransformFeedbackEXT driDispatchRemapTable[BeginTransformFeedbackEXT_remap_index]
-#define _gloffset_BindBufferBaseEXT driDispatchRemapTable[BindBufferBaseEXT_remap_index]
-#define _gloffset_BindBufferOffsetEXT driDispatchRemapTable[BindBufferOffsetEXT_remap_index]
-#define _gloffset_BindBufferRangeEXT driDispatchRemapTable[BindBufferRangeEXT_remap_index]
-#define _gloffset_EndTransformFeedbackEXT driDispatchRemapTable[EndTransformFeedbackEXT_remap_index]
-#define _gloffset_GetTransformFeedbackVaryingEXT driDispatchRemapTable[GetTransformFeedbackVaryingEXT_remap_index]
-#define _gloffset_TransformFeedbackVaryingsEXT driDispatchRemapTable[TransformFeedbackVaryingsEXT_remap_index]
-#define _gloffset_ProvokingVertexEXT driDispatchRemapTable[ProvokingVertexEXT_remap_index]
-#define _gloffset_GetTexParameterPointervAPPLE driDispatchRemapTable[GetTexParameterPointervAPPLE_remap_index]
-#define _gloffset_TextureRangeAPPLE driDispatchRemapTable[TextureRangeAPPLE_remap_index]
-#define _gloffset_GetObjectParameterivAPPLE driDispatchRemapTable[GetObjectParameterivAPPLE_remap_index]
-#define _gloffset_ObjectPurgeableAPPLE driDispatchRemapTable[ObjectPurgeableAPPLE_remap_index]
-#define _gloffset_ObjectUnpurgeableAPPLE driDispatchRemapTable[ObjectUnpurgeableAPPLE_remap_index]
-#define _gloffset_ActiveProgramEXT driDispatchRemapTable[ActiveProgramEXT_remap_index]
-#define _gloffset_CreateShaderProgramEXT driDispatchRemapTable[CreateShaderProgramEXT_remap_index]
-#define _gloffset_UseShaderProgramEXT driDispatchRemapTable[UseShaderProgramEXT_remap_index]
-#define _gloffset_TextureBarrierNV driDispatchRemapTable[TextureBarrierNV_remap_index]
-#define _gloffset_StencilFuncSeparateATI driDispatchRemapTable[StencilFuncSeparateATI_remap_index]
-#define _gloffset_ProgramEnvParameters4fvEXT driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index]
-#define _gloffset_ProgramLocalParameters4fvEXT driDispatchRemapTable[ProgramLocalParameters4fvEXT_remap_index]
-#define _gloffset_GetQueryObjecti64vEXT driDispatchRemapTable[GetQueryObjecti64vEXT_remap_index]
-#define _gloffset_GetQueryObjectui64vEXT driDispatchRemapTable[GetQueryObjectui64vEXT_remap_index]
-#define _gloffset_EGLImageTargetRenderbufferStorageOES driDispatchRemapTable[EGLImageTargetRenderbufferStorageOES_remap_index]
-#define _gloffset_EGLImageTargetTexture2DOES driDispatchRemapTable[EGLImageTargetTexture2DOES_remap_index]
-
-#endif                          /* !FEATURE_remap_table */
-
-typedef void (GLAPIENTRYP _glptr_NewList) (GLuint, GLenum);
-
-#define CALL_NewList(disp, parameters) \
-    (* GET_NewList(disp)) parameters
-static inline _glptr_NewList
-GET_NewList(struct _glapi_table *disp)
-{
-    return (_glptr_NewList) (GET_by_offset(disp, _gloffset_NewList));
-}
-
-static inline void
-SET_NewList(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_NewList, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EndList) (void);
-
-#define CALL_EndList(disp, parameters) \
-    (* GET_EndList(disp)) parameters
-static inline _glptr_EndList
-GET_EndList(struct _glapi_table *disp)
-{
-    return (_glptr_EndList) (GET_by_offset(disp, _gloffset_EndList));
-}
-
-static inline void
-SET_EndList(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_EndList, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CallList) (GLuint);
-
-#define CALL_CallList(disp, parameters) \
-    (* GET_CallList(disp)) parameters
-static inline _glptr_CallList
-GET_CallList(struct _glapi_table *disp)
-{
-    return (_glptr_CallList) (GET_by_offset(disp, _gloffset_CallList));
-}
-
-static inline void
-SET_CallList(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_CallList, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CallLists) (GLsizei, GLenum, const GLvoid *);
-
-#define CALL_CallLists(disp, parameters) \
-    (* GET_CallLists(disp)) parameters
-static inline _glptr_CallLists
-GET_CallLists(struct _glapi_table *disp)
-{
-    return (_glptr_CallLists) (GET_by_offset(disp, _gloffset_CallLists));
-}
-
-static inline void
-SET_CallLists(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLsizei, GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CallLists, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteLists) (GLuint, GLsizei);
-
-#define CALL_DeleteLists(disp, parameters) \
-    (* GET_DeleteLists(disp)) parameters
-static inline _glptr_DeleteLists
-GET_DeleteLists(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteLists) (GET_by_offset(disp, _gloffset_DeleteLists));
-}
-
-static inline void
-SET_DeleteLists(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLuint, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_DeleteLists, fn);
-}
-
-typedef GLuint(GLAPIENTRYP _glptr_GenLists) (GLsizei);
-
-#define CALL_GenLists(disp, parameters) \
-    (* GET_GenLists(disp)) parameters
-static inline _glptr_GenLists
-GET_GenLists(struct _glapi_table *disp)
-{
-    return (_glptr_GenLists) (GET_by_offset(disp, _gloffset_GenLists));
-}
-
-static inline void
-SET_GenLists(struct _glapi_table *disp, GLuint(GLAPIENTRYP fn) (GLsizei))
-{
-    SET_by_offset(disp, _gloffset_GenLists, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ListBase) (GLuint);
-
-#define CALL_ListBase(disp, parameters) \
-    (* GET_ListBase(disp)) parameters
-static inline _glptr_ListBase
-GET_ListBase(struct _glapi_table *disp)
-{
-    return (_glptr_ListBase) (GET_by_offset(disp, _gloffset_ListBase));
-}
-
-static inline void
-SET_ListBase(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_ListBase, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Begin) (GLenum);
-
-#define CALL_Begin(disp, parameters) \
-    (* GET_Begin(disp)) parameters
-static inline _glptr_Begin
-GET_Begin(struct _glapi_table *disp)
-{
-    return (_glptr_Begin) (GET_by_offset(disp, _gloffset_Begin));
-}
-
-static inline void
-SET_Begin(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_Begin, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Bitmap) (GLsizei, GLsizei, GLfloat, GLfloat,
-                                          GLfloat, GLfloat, const GLubyte *);
-#define CALL_Bitmap(disp, parameters) \
-    (* GET_Bitmap(disp)) parameters
-static inline _glptr_Bitmap
-GET_Bitmap(struct _glapi_table *disp)
-{
-    return (_glptr_Bitmap) (GET_by_offset(disp, _gloffset_Bitmap));
-}
-
-static inline void
-SET_Bitmap(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (GLsizei, GLsizei, GLfloat, GLfloat, GLfloat,
-                                  GLfloat, const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_Bitmap, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3b) (GLbyte, GLbyte, GLbyte);
-
-#define CALL_Color3b(disp, parameters) \
-    (* GET_Color3b(disp)) parameters
-static inline _glptr_Color3b
-GET_Color3b(struct _glapi_table *disp)
-{
-    return (_glptr_Color3b) (GET_by_offset(disp, _gloffset_Color3b));
-}
-
-static inline void
-SET_Color3b(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLbyte, GLbyte, GLbyte))
-{
-    SET_by_offset(disp, _gloffset_Color3b, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3bv) (const GLbyte *);
-
-#define CALL_Color3bv(disp, parameters) \
-    (* GET_Color3bv(disp)) parameters
-static inline _glptr_Color3bv
-GET_Color3bv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3bv) (GET_by_offset(disp, _gloffset_Color3bv));
-}
-
-static inline void
-SET_Color3bv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_Color3bv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3d) (GLdouble, GLdouble, GLdouble);
-
-#define CALL_Color3d(disp, parameters) \
-    (* GET_Color3d(disp)) parameters
-static inline _glptr_Color3d
-GET_Color3d(struct _glapi_table *disp)
-{
-    return (_glptr_Color3d) (GET_by_offset(disp, _gloffset_Color3d));
-}
-
-static inline void
-SET_Color3d(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Color3d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3dv) (const GLdouble *);
-
-#define CALL_Color3dv(disp, parameters) \
-    (* GET_Color3dv(disp)) parameters
-static inline _glptr_Color3dv
-GET_Color3dv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3dv) (GET_by_offset(disp, _gloffset_Color3dv));
-}
-
-static inline void
-SET_Color3dv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Color3dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3f) (GLfloat, GLfloat, GLfloat);
-
-#define CALL_Color3f(disp, parameters) \
-    (* GET_Color3f(disp)) parameters
-static inline _glptr_Color3f
-GET_Color3f(struct _glapi_table *disp)
-{
-    return (_glptr_Color3f) (GET_by_offset(disp, _gloffset_Color3f));
-}
-
-static inline void
-SET_Color3f(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Color3f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3fv) (const GLfloat *);
-
-#define CALL_Color3fv(disp, parameters) \
-    (* GET_Color3fv(disp)) parameters
-static inline _glptr_Color3fv
-GET_Color3fv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3fv) (GET_by_offset(disp, _gloffset_Color3fv));
-}
-
-static inline void
-SET_Color3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Color3fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3i) (GLint, GLint, GLint);
-
-#define CALL_Color3i(disp, parameters) \
-    (* GET_Color3i(disp)) parameters
-static inline _glptr_Color3i
-GET_Color3i(struct _glapi_table *disp)
-{
-    return (_glptr_Color3i) (GET_by_offset(disp, _gloffset_Color3i));
-}
-
-static inline void
-SET_Color3i(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Color3i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3iv) (const GLint *);
-
-#define CALL_Color3iv(disp, parameters) \
-    (* GET_Color3iv(disp)) parameters
-static inline _glptr_Color3iv
-GET_Color3iv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3iv) (GET_by_offset(disp, _gloffset_Color3iv));
-}
-
-static inline void
-SET_Color3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Color3iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3s) (GLshort, GLshort, GLshort);
-
-#define CALL_Color3s(disp, parameters) \
-    (* GET_Color3s(disp)) parameters
-static inline _glptr_Color3s
-GET_Color3s(struct _glapi_table *disp)
-{
-    return (_glptr_Color3s) (GET_by_offset(disp, _gloffset_Color3s));
-}
-
-static inline void
-SET_Color3s(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Color3s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3sv) (const GLshort *);
-
-#define CALL_Color3sv(disp, parameters) \
-    (* GET_Color3sv(disp)) parameters
-static inline _glptr_Color3sv
-GET_Color3sv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3sv) (GET_by_offset(disp, _gloffset_Color3sv));
-}
-
-static inline void
-SET_Color3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Color3sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3ub) (GLubyte, GLubyte, GLubyte);
-
-#define CALL_Color3ub(disp, parameters) \
-    (* GET_Color3ub(disp)) parameters
-static inline _glptr_Color3ub
-GET_Color3ub(struct _glapi_table *disp)
-{
-    return (_glptr_Color3ub) (GET_by_offset(disp, _gloffset_Color3ub));
-}
-
-static inline void
-SET_Color3ub(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLubyte, GLubyte, GLubyte))
-{
-    SET_by_offset(disp, _gloffset_Color3ub, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3ubv) (const GLubyte *);
-
-#define CALL_Color3ubv(disp, parameters) \
-    (* GET_Color3ubv(disp)) parameters
-static inline _glptr_Color3ubv
-GET_Color3ubv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3ubv) (GET_by_offset(disp, _gloffset_Color3ubv));
-}
-
-static inline void
-SET_Color3ubv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_Color3ubv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3ui) (GLuint, GLuint, GLuint);
-
-#define CALL_Color3ui(disp, parameters) \
-    (* GET_Color3ui(disp)) parameters
-static inline _glptr_Color3ui
-GET_Color3ui(struct _glapi_table *disp)
-{
-    return (_glptr_Color3ui) (GET_by_offset(disp, _gloffset_Color3ui));
-}
-
-static inline void
-SET_Color3ui(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_Color3ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3uiv) (const GLuint *);
-
-#define CALL_Color3uiv(disp, parameters) \
-    (* GET_Color3uiv(disp)) parameters
-static inline _glptr_Color3uiv
-GET_Color3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3uiv) (GET_by_offset(disp, _gloffset_Color3uiv));
-}
-
-static inline void
-SET_Color3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_Color3uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3us) (GLushort, GLushort, GLushort);
-
-#define CALL_Color3us(disp, parameters) \
-    (* GET_Color3us(disp)) parameters
-static inline _glptr_Color3us
-GET_Color3us(struct _glapi_table *disp)
-{
-    return (_glptr_Color3us) (GET_by_offset(disp, _gloffset_Color3us));
-}
-
-static inline void
-SET_Color3us(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLushort, GLushort, GLushort))
-{
-    SET_by_offset(disp, _gloffset_Color3us, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color3usv) (const GLushort *);
-
-#define CALL_Color3usv(disp, parameters) \
-    (* GET_Color3usv(disp)) parameters
-static inline _glptr_Color3usv
-GET_Color3usv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3usv) (GET_by_offset(disp, _gloffset_Color3usv));
-}
-
-static inline void
-SET_Color3usv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_Color3usv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4b) (GLbyte, GLbyte, GLbyte, GLbyte);
-
-#define CALL_Color4b(disp, parameters) \
-    (* GET_Color4b(disp)) parameters
-static inline _glptr_Color4b
-GET_Color4b(struct _glapi_table *disp)
-{
-    return (_glptr_Color4b) (GET_by_offset(disp, _gloffset_Color4b));
-}
-
-static inline void
-SET_Color4b(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLbyte, GLbyte, GLbyte, GLbyte))
-{
-    SET_by_offset(disp, _gloffset_Color4b, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4bv) (const GLbyte *);
-
-#define CALL_Color4bv(disp, parameters) \
-    (* GET_Color4bv(disp)) parameters
-static inline _glptr_Color4bv
-GET_Color4bv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4bv) (GET_by_offset(disp, _gloffset_Color4bv));
-}
-
-static inline void
-SET_Color4bv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_Color4bv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4d) (GLdouble, GLdouble, GLdouble,
-                                           GLdouble);
-#define CALL_Color4d(disp, parameters) \
-    (* GET_Color4d(disp)) parameters
-static inline _glptr_Color4d
-GET_Color4d(struct _glapi_table *disp)
-{
-    return (_glptr_Color4d) (GET_by_offset(disp, _gloffset_Color4d));
-}
-
-static inline void
-SET_Color4d(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Color4d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4dv) (const GLdouble *);
-
-#define CALL_Color4dv(disp, parameters) \
-    (* GET_Color4dv(disp)) parameters
-static inline _glptr_Color4dv
-GET_Color4dv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4dv) (GET_by_offset(disp, _gloffset_Color4dv));
-}
-
-static inline void
-SET_Color4dv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Color4dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4f) (GLfloat, GLfloat, GLfloat, GLfloat);
-
-#define CALL_Color4f(disp, parameters) \
-    (* GET_Color4f(disp)) parameters
-static inline _glptr_Color4f
-GET_Color4f(struct _glapi_table *disp)
-{
-    return (_glptr_Color4f) (GET_by_offset(disp, _gloffset_Color4f));
-}
-
-static inline void
-SET_Color4f(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Color4f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4fv) (const GLfloat *);
-
-#define CALL_Color4fv(disp, parameters) \
-    (* GET_Color4fv(disp)) parameters
-static inline _glptr_Color4fv
-GET_Color4fv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4fv) (GET_by_offset(disp, _gloffset_Color4fv));
-}
-
-static inline void
-SET_Color4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Color4fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4i) (GLint, GLint, GLint, GLint);
-
-#define CALL_Color4i(disp, parameters) \
-    (* GET_Color4i(disp)) parameters
-static inline _glptr_Color4i
-GET_Color4i(struct _glapi_table *disp)
-{
-    return (_glptr_Color4i) (GET_by_offset(disp, _gloffset_Color4i));
-}
-
-static inline void
-SET_Color4i(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Color4i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4iv) (const GLint *);
-
-#define CALL_Color4iv(disp, parameters) \
-    (* GET_Color4iv(disp)) parameters
-static inline _glptr_Color4iv
-GET_Color4iv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4iv) (GET_by_offset(disp, _gloffset_Color4iv));
-}
-
-static inline void
-SET_Color4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Color4iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4s) (GLshort, GLshort, GLshort, GLshort);
-
-#define CALL_Color4s(disp, parameters) \
-    (* GET_Color4s(disp)) parameters
-static inline _glptr_Color4s
-GET_Color4s(struct _glapi_table *disp)
-{
-    return (_glptr_Color4s) (GET_by_offset(disp, _gloffset_Color4s));
-}
-
-static inline void
-SET_Color4s(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Color4s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4sv) (const GLshort *);
-
-#define CALL_Color4sv(disp, parameters) \
-    (* GET_Color4sv(disp)) parameters
-static inline _glptr_Color4sv
-GET_Color4sv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4sv) (GET_by_offset(disp, _gloffset_Color4sv));
-}
-
-static inline void
-SET_Color4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Color4sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4ub) (GLubyte, GLubyte, GLubyte, GLubyte);
-
-#define CALL_Color4ub(disp, parameters) \
-    (* GET_Color4ub(disp)) parameters
-static inline _glptr_Color4ub
-GET_Color4ub(struct _glapi_table *disp)
-{
-    return (_glptr_Color4ub) (GET_by_offset(disp, _gloffset_Color4ub));
-}
-
-static inline void
-SET_Color4ub(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLubyte, GLubyte, GLubyte, GLubyte))
-{
-    SET_by_offset(disp, _gloffset_Color4ub, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4ubv) (const GLubyte *);
-
-#define CALL_Color4ubv(disp, parameters) \
-    (* GET_Color4ubv(disp)) parameters
-static inline _glptr_Color4ubv
-GET_Color4ubv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4ubv) (GET_by_offset(disp, _gloffset_Color4ubv));
-}
-
-static inline void
-SET_Color4ubv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_Color4ubv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4ui) (GLuint, GLuint, GLuint, GLuint);
-
-#define CALL_Color4ui(disp, parameters) \
-    (* GET_Color4ui(disp)) parameters
-static inline _glptr_Color4ui
-GET_Color4ui(struct _glapi_table *disp)
-{
-    return (_glptr_Color4ui) (GET_by_offset(disp, _gloffset_Color4ui));
-}
-
-static inline void
-SET_Color4ui(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_Color4ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4uiv) (const GLuint *);
-
-#define CALL_Color4uiv(disp, parameters) \
-    (* GET_Color4uiv(disp)) parameters
-static inline _glptr_Color4uiv
-GET_Color4uiv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4uiv) (GET_by_offset(disp, _gloffset_Color4uiv));
-}
-
-static inline void
-SET_Color4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_Color4uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4us) (GLushort, GLushort, GLushort,
-                                            GLushort);
-#define CALL_Color4us(disp, parameters) \
-    (* GET_Color4us(disp)) parameters
-static inline _glptr_Color4us
-GET_Color4us(struct _glapi_table *disp)
-{
-    return (_glptr_Color4us) (GET_by_offset(disp, _gloffset_Color4us));
-}
-
-static inline void
-SET_Color4us(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLushort, GLushort, GLushort, GLushort))
-{
-    SET_by_offset(disp, _gloffset_Color4us, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Color4usv) (const GLushort *);
-
-#define CALL_Color4usv(disp, parameters) \
-    (* GET_Color4usv(disp)) parameters
-static inline _glptr_Color4usv
-GET_Color4usv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4usv) (GET_by_offset(disp, _gloffset_Color4usv));
-}
-
-static inline void
-SET_Color4usv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_Color4usv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EdgeFlag) (GLboolean);
-
-#define CALL_EdgeFlag(disp, parameters) \
-    (* GET_EdgeFlag(disp)) parameters
-static inline _glptr_EdgeFlag
-GET_EdgeFlag(struct _glapi_table *disp)
-{
-    return (_glptr_EdgeFlag) (GET_by_offset(disp, _gloffset_EdgeFlag));
-}
-
-static inline void
-SET_EdgeFlag(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLboolean))
-{
-    SET_by_offset(disp, _gloffset_EdgeFlag, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EdgeFlagv) (const GLboolean *);
-
-#define CALL_EdgeFlagv(disp, parameters) \
-    (* GET_EdgeFlagv(disp)) parameters
-static inline _glptr_EdgeFlagv
-GET_EdgeFlagv(struct _glapi_table *disp)
-{
-    return (_glptr_EdgeFlagv) (GET_by_offset(disp, _gloffset_EdgeFlagv));
-}
-
-static inline void
-SET_EdgeFlagv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLboolean *))
-{
-    SET_by_offset(disp, _gloffset_EdgeFlagv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_End) (void);
-
-#define CALL_End(disp, parameters) \
-    (* GET_End(disp)) parameters
-static inline _glptr_End
-GET_End(struct _glapi_table *disp)
-{
-    return (_glptr_End) (GET_by_offset(disp, _gloffset_End));
-}
-
-static inline void
-SET_End(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_End, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Indexd) (GLdouble);
-
-#define CALL_Indexd(disp, parameters) \
-    (* GET_Indexd(disp)) parameters
-static inline _glptr_Indexd
-GET_Indexd(struct _glapi_table *disp)
-{
-    return (_glptr_Indexd) (GET_by_offset(disp, _gloffset_Indexd));
-}
-
-static inline void
-SET_Indexd(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Indexd, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Indexdv) (const GLdouble *);
-
-#define CALL_Indexdv(disp, parameters) \
-    (* GET_Indexdv(disp)) parameters
-static inline _glptr_Indexdv
-GET_Indexdv(struct _glapi_table *disp)
-{
-    return (_glptr_Indexdv) (GET_by_offset(disp, _gloffset_Indexdv));
-}
-
-static inline void
-SET_Indexdv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Indexdv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Indexf) (GLfloat);
-
-#define CALL_Indexf(disp, parameters) \
-    (* GET_Indexf(disp)) parameters
-static inline _glptr_Indexf
-GET_Indexf(struct _glapi_table *disp)
-{
-    return (_glptr_Indexf) (GET_by_offset(disp, _gloffset_Indexf));
-}
-
-static inline void
-SET_Indexf(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Indexf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Indexfv) (const GLfloat *);
-
-#define CALL_Indexfv(disp, parameters) \
-    (* GET_Indexfv(disp)) parameters
-static inline _glptr_Indexfv
-GET_Indexfv(struct _glapi_table *disp)
-{
-    return (_glptr_Indexfv) (GET_by_offset(disp, _gloffset_Indexfv));
-}
-
-static inline void
-SET_Indexfv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Indexfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Indexi) (GLint);
-
-#define CALL_Indexi(disp, parameters) \
-    (* GET_Indexi(disp)) parameters
-static inline _glptr_Indexi
-GET_Indexi(struct _glapi_table *disp)
-{
-    return (_glptr_Indexi) (GET_by_offset(disp, _gloffset_Indexi));
-}
-
-static inline void
-SET_Indexi(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint))
-{
-    SET_by_offset(disp, _gloffset_Indexi, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Indexiv) (const GLint *);
-
-#define CALL_Indexiv(disp, parameters) \
-    (* GET_Indexiv(disp)) parameters
-static inline _glptr_Indexiv
-GET_Indexiv(struct _glapi_table *disp)
-{
-    return (_glptr_Indexiv) (GET_by_offset(disp, _gloffset_Indexiv));
-}
-
-static inline void
-SET_Indexiv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Indexiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Indexs) (GLshort);
-
-#define CALL_Indexs(disp, parameters) \
-    (* GET_Indexs(disp)) parameters
-static inline _glptr_Indexs
-GET_Indexs(struct _glapi_table *disp)
-{
-    return (_glptr_Indexs) (GET_by_offset(disp, _gloffset_Indexs));
-}
-
-static inline void
-SET_Indexs(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLshort))
-{
-    SET_by_offset(disp, _gloffset_Indexs, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Indexsv) (const GLshort *);
-
-#define CALL_Indexsv(disp, parameters) \
-    (* GET_Indexsv(disp)) parameters
-static inline _glptr_Indexsv
-GET_Indexsv(struct _glapi_table *disp)
-{
-    return (_glptr_Indexsv) (GET_by_offset(disp, _gloffset_Indexsv));
-}
-
-static inline void
-SET_Indexsv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Indexsv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Normal3b) (GLbyte, GLbyte, GLbyte);
-
-#define CALL_Normal3b(disp, parameters) \
-    (* GET_Normal3b(disp)) parameters
-static inline _glptr_Normal3b
-GET_Normal3b(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3b) (GET_by_offset(disp, _gloffset_Normal3b));
-}
-
-static inline void
-SET_Normal3b(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLbyte, GLbyte, GLbyte))
-{
-    SET_by_offset(disp, _gloffset_Normal3b, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Normal3bv) (const GLbyte *);
-
-#define CALL_Normal3bv(disp, parameters) \
-    (* GET_Normal3bv(disp)) parameters
-static inline _glptr_Normal3bv
-GET_Normal3bv(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3bv) (GET_by_offset(disp, _gloffset_Normal3bv));
-}
-
-static inline void
-SET_Normal3bv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_Normal3bv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Normal3d) (GLdouble, GLdouble, GLdouble);
-
-#define CALL_Normal3d(disp, parameters) \
-    (* GET_Normal3d(disp)) parameters
-static inline _glptr_Normal3d
-GET_Normal3d(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3d) (GET_by_offset(disp, _gloffset_Normal3d));
-}
-
-static inline void
-SET_Normal3d(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Normal3d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Normal3dv) (const GLdouble *);
-
-#define CALL_Normal3dv(disp, parameters) \
-    (* GET_Normal3dv(disp)) parameters
-static inline _glptr_Normal3dv
-GET_Normal3dv(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3dv) (GET_by_offset(disp, _gloffset_Normal3dv));
-}
-
-static inline void
-SET_Normal3dv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Normal3dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Normal3f) (GLfloat, GLfloat, GLfloat);
-
-#define CALL_Normal3f(disp, parameters) \
-    (* GET_Normal3f(disp)) parameters
-static inline _glptr_Normal3f
-GET_Normal3f(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3f) (GET_by_offset(disp, _gloffset_Normal3f));
-}
-
-static inline void
-SET_Normal3f(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Normal3f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Normal3fv) (const GLfloat *);
-
-#define CALL_Normal3fv(disp, parameters) \
-    (* GET_Normal3fv(disp)) parameters
-static inline _glptr_Normal3fv
-GET_Normal3fv(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3fv) (GET_by_offset(disp, _gloffset_Normal3fv));
-}
-
-static inline void
-SET_Normal3fv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Normal3fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Normal3i) (GLint, GLint, GLint);
-
-#define CALL_Normal3i(disp, parameters) \
-    (* GET_Normal3i(disp)) parameters
-static inline _glptr_Normal3i
-GET_Normal3i(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3i) (GET_by_offset(disp, _gloffset_Normal3i));
-}
-
-static inline void
-SET_Normal3i(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Normal3i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Normal3iv) (const GLint *);
-
-#define CALL_Normal3iv(disp, parameters) \
-    (* GET_Normal3iv(disp)) parameters
-static inline _glptr_Normal3iv
-GET_Normal3iv(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3iv) (GET_by_offset(disp, _gloffset_Normal3iv));
-}
-
-static inline void
-SET_Normal3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Normal3iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Normal3s) (GLshort, GLshort, GLshort);
-
-#define CALL_Normal3s(disp, parameters) \
-    (* GET_Normal3s(disp)) parameters
-static inline _glptr_Normal3s
-GET_Normal3s(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3s) (GET_by_offset(disp, _gloffset_Normal3s));
-}
-
-static inline void
-SET_Normal3s(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Normal3s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Normal3sv) (const GLshort *);
-
-#define CALL_Normal3sv(disp, parameters) \
-    (* GET_Normal3sv(disp)) parameters
-static inline _glptr_Normal3sv
-GET_Normal3sv(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3sv) (GET_by_offset(disp, _gloffset_Normal3sv));
-}
-
-static inline void
-SET_Normal3sv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Normal3sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos2d) (GLdouble, GLdouble);
-
-#define CALL_RasterPos2d(disp, parameters) \
-    (* GET_RasterPos2d(disp)) parameters
-static inline _glptr_RasterPos2d
-GET_RasterPos2d(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2d) (GET_by_offset(disp, _gloffset_RasterPos2d));
-}
-
-static inline void
-SET_RasterPos2d(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos2dv) (const GLdouble *);
-
-#define CALL_RasterPos2dv(disp, parameters) \
-    (* GET_RasterPos2dv(disp)) parameters
-static inline _glptr_RasterPos2dv
-GET_RasterPos2dv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2dv) (GET_by_offset(disp, _gloffset_RasterPos2dv));
-}
-
-static inline void
-SET_RasterPos2dv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos2f) (GLfloat, GLfloat);
-
-#define CALL_RasterPos2f(disp, parameters) \
-    (* GET_RasterPos2f(disp)) parameters
-static inline _glptr_RasterPos2f
-GET_RasterPos2f(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2f) (GET_by_offset(disp, _gloffset_RasterPos2f));
-}
-
-static inline void
-SET_RasterPos2f(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos2fv) (const GLfloat *);
-
-#define CALL_RasterPos2fv(disp, parameters) \
-    (* GET_RasterPos2fv(disp)) parameters
-static inline _glptr_RasterPos2fv
-GET_RasterPos2fv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2fv) (GET_by_offset(disp, _gloffset_RasterPos2fv));
-}
-
-static inline void
-SET_RasterPos2fv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos2i) (GLint, GLint);
-
-#define CALL_RasterPos2i(disp, parameters) \
-    (* GET_RasterPos2i(disp)) parameters
-static inline _glptr_RasterPos2i
-GET_RasterPos2i(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2i) (GET_by_offset(disp, _gloffset_RasterPos2i));
-}
-
-static inline void
-SET_RasterPos2i(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos2iv) (const GLint *);
-
-#define CALL_RasterPos2iv(disp, parameters) \
-    (* GET_RasterPos2iv(disp)) parameters
-static inline _glptr_RasterPos2iv
-GET_RasterPos2iv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2iv) (GET_by_offset(disp, _gloffset_RasterPos2iv));
-}
-
-static inline void
-SET_RasterPos2iv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos2s) (GLshort, GLshort);
-
-#define CALL_RasterPos2s(disp, parameters) \
-    (* GET_RasterPos2s(disp)) parameters
-static inline _glptr_RasterPos2s
-GET_RasterPos2s(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2s) (GET_by_offset(disp, _gloffset_RasterPos2s));
-}
-
-static inline void
-SET_RasterPos2s(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos2sv) (const GLshort *);
-
-#define CALL_RasterPos2sv(disp, parameters) \
-    (* GET_RasterPos2sv(disp)) parameters
-static inline _glptr_RasterPos2sv
-GET_RasterPos2sv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2sv) (GET_by_offset(disp, _gloffset_RasterPos2sv));
-}
-
-static inline void
-SET_RasterPos2sv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos3d) (GLdouble, GLdouble, GLdouble);
-
-#define CALL_RasterPos3d(disp, parameters) \
-    (* GET_RasterPos3d(disp)) parameters
-static inline _glptr_RasterPos3d
-GET_RasterPos3d(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3d) (GET_by_offset(disp, _gloffset_RasterPos3d));
-}
-
-static inline void
-SET_RasterPos3d(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos3dv) (const GLdouble *);
-
-#define CALL_RasterPos3dv(disp, parameters) \
-    (* GET_RasterPos3dv(disp)) parameters
-static inline _glptr_RasterPos3dv
-GET_RasterPos3dv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3dv) (GET_by_offset(disp, _gloffset_RasterPos3dv));
-}
-
-static inline void
-SET_RasterPos3dv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos3f) (GLfloat, GLfloat, GLfloat);
-
-#define CALL_RasterPos3f(disp, parameters) \
-    (* GET_RasterPos3f(disp)) parameters
-static inline _glptr_RasterPos3f
-GET_RasterPos3f(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3f) (GET_by_offset(disp, _gloffset_RasterPos3f));
-}
-
-static inline void
-SET_RasterPos3f(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos3fv) (const GLfloat *);
-
-#define CALL_RasterPos3fv(disp, parameters) \
-    (* GET_RasterPos3fv(disp)) parameters
-static inline _glptr_RasterPos3fv
-GET_RasterPos3fv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3fv) (GET_by_offset(disp, _gloffset_RasterPos3fv));
-}
-
-static inline void
-SET_RasterPos3fv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos3i) (GLint, GLint, GLint);
-
-#define CALL_RasterPos3i(disp, parameters) \
-    (* GET_RasterPos3i(disp)) parameters
-static inline _glptr_RasterPos3i
-GET_RasterPos3i(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3i) (GET_by_offset(disp, _gloffset_RasterPos3i));
-}
-
-static inline void
-SET_RasterPos3i(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos3iv) (const GLint *);
-
-#define CALL_RasterPos3iv(disp, parameters) \
-    (* GET_RasterPos3iv(disp)) parameters
-static inline _glptr_RasterPos3iv
-GET_RasterPos3iv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3iv) (GET_by_offset(disp, _gloffset_RasterPos3iv));
-}
-
-static inline void
-SET_RasterPos3iv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos3s) (GLshort, GLshort, GLshort);
-
-#define CALL_RasterPos3s(disp, parameters) \
-    (* GET_RasterPos3s(disp)) parameters
-static inline _glptr_RasterPos3s
-GET_RasterPos3s(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3s) (GET_by_offset(disp, _gloffset_RasterPos3s));
-}
-
-static inline void
-SET_RasterPos3s(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos3sv) (const GLshort *);
-
-#define CALL_RasterPos3sv(disp, parameters) \
-    (* GET_RasterPos3sv(disp)) parameters
-static inline _glptr_RasterPos3sv
-GET_RasterPos3sv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3sv) (GET_by_offset(disp, _gloffset_RasterPos3sv));
-}
-
-static inline void
-SET_RasterPos3sv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos4d) (GLdouble, GLdouble, GLdouble,
-                                               GLdouble);
-#define CALL_RasterPos4d(disp, parameters) \
-    (* GET_RasterPos4d(disp)) parameters
-static inline _glptr_RasterPos4d
-GET_RasterPos4d(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4d) (GET_by_offset(disp, _gloffset_RasterPos4d));
-}
-
-static inline void
-SET_RasterPos4d(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos4dv) (const GLdouble *);
-
-#define CALL_RasterPos4dv(disp, parameters) \
-    (* GET_RasterPos4dv(disp)) parameters
-static inline _glptr_RasterPos4dv
-GET_RasterPos4dv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4dv) (GET_by_offset(disp, _gloffset_RasterPos4dv));
-}
-
-static inline void
-SET_RasterPos4dv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos4f) (GLfloat, GLfloat, GLfloat,
-                                               GLfloat);
-#define CALL_RasterPos4f(disp, parameters) \
-    (* GET_RasterPos4f(disp)) parameters
-static inline _glptr_RasterPos4f
-GET_RasterPos4f(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4f) (GET_by_offset(disp, _gloffset_RasterPos4f));
-}
-
-static inline void
-SET_RasterPos4f(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos4fv) (const GLfloat *);
-
-#define CALL_RasterPos4fv(disp, parameters) \
-    (* GET_RasterPos4fv(disp)) parameters
-static inline _glptr_RasterPos4fv
-GET_RasterPos4fv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4fv) (GET_by_offset(disp, _gloffset_RasterPos4fv));
-}
-
-static inline void
-SET_RasterPos4fv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos4i) (GLint, GLint, GLint, GLint);
-
-#define CALL_RasterPos4i(disp, parameters) \
-    (* GET_RasterPos4i(disp)) parameters
-static inline _glptr_RasterPos4i
-GET_RasterPos4i(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4i) (GET_by_offset(disp, _gloffset_RasterPos4i));
-}
-
-static inline void
-SET_RasterPos4i(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos4iv) (const GLint *);
-
-#define CALL_RasterPos4iv(disp, parameters) \
-    (* GET_RasterPos4iv(disp)) parameters
-static inline _glptr_RasterPos4iv
-GET_RasterPos4iv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4iv) (GET_by_offset(disp, _gloffset_RasterPos4iv));
-}
-
-static inline void
-SET_RasterPos4iv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos4s) (GLshort, GLshort, GLshort,
-                                               GLshort);
-#define CALL_RasterPos4s(disp, parameters) \
-    (* GET_RasterPos4s(disp)) parameters
-static inline _glptr_RasterPos4s
-GET_RasterPos4s(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4s) (GET_by_offset(disp, _gloffset_RasterPos4s));
-}
-
-static inline void
-SET_RasterPos4s(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RasterPos4sv) (const GLshort *);
-
-#define CALL_RasterPos4sv(disp, parameters) \
-    (* GET_RasterPos4sv(disp)) parameters
-static inline _glptr_RasterPos4sv
-GET_RasterPos4sv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4sv) (GET_by_offset(disp, _gloffset_RasterPos4sv));
-}
-
-static inline void
-SET_RasterPos4sv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Rectd) (GLdouble, GLdouble, GLdouble,
-                                         GLdouble);
-#define CALL_Rectd(disp, parameters) \
-    (* GET_Rectd(disp)) parameters
-static inline _glptr_Rectd
-GET_Rectd(struct _glapi_table *disp)
-{
-    return (_glptr_Rectd) (GET_by_offset(disp, _gloffset_Rectd));
-}
-
-static inline void
-SET_Rectd(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Rectd, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Rectdv) (const GLdouble *, const GLdouble *);
-
-#define CALL_Rectdv(disp, parameters) \
-    (* GET_Rectdv(disp)) parameters
-static inline _glptr_Rectdv
-GET_Rectdv(struct _glapi_table *disp)
-{
-    return (_glptr_Rectdv) (GET_by_offset(disp, _gloffset_Rectdv));
-}
-
-static inline void
-SET_Rectdv(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (const GLdouble *, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Rectdv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Rectf) (GLfloat, GLfloat, GLfloat, GLfloat);
-
-#define CALL_Rectf(disp, parameters) \
-    (* GET_Rectf(disp)) parameters
-static inline _glptr_Rectf
-GET_Rectf(struct _glapi_table *disp)
-{
-    return (_glptr_Rectf) (GET_by_offset(disp, _gloffset_Rectf));
-}
-
-static inline void
-SET_Rectf(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Rectf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Rectfv) (const GLfloat *, const GLfloat *);
-
-#define CALL_Rectfv(disp, parameters) \
-    (* GET_Rectfv(disp)) parameters
-static inline _glptr_Rectfv
-GET_Rectfv(struct _glapi_table *disp)
-{
-    return (_glptr_Rectfv) (GET_by_offset(disp, _gloffset_Rectfv));
-}
-
-static inline void
-SET_Rectfv(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (const GLfloat *, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Rectfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Recti) (GLint, GLint, GLint, GLint);
-
-#define CALL_Recti(disp, parameters) \
-    (* GET_Recti(disp)) parameters
-static inline _glptr_Recti
-GET_Recti(struct _glapi_table *disp)
-{
-    return (_glptr_Recti) (GET_by_offset(disp, _gloffset_Recti));
-}
-
-static inline void
-SET_Recti(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Recti, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Rectiv) (const GLint *, const GLint *);
-
-#define CALL_Rectiv(disp, parameters) \
-    (* GET_Rectiv(disp)) parameters
-static inline _glptr_Rectiv
-GET_Rectiv(struct _glapi_table *disp)
-{
-    return (_glptr_Rectiv) (GET_by_offset(disp, _gloffset_Rectiv));
-}
-
-static inline void
-SET_Rectiv(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (const GLint *, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Rectiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Rects) (GLshort, GLshort, GLshort, GLshort);
-
-#define CALL_Rects(disp, parameters) \
-    (* GET_Rects(disp)) parameters
-static inline _glptr_Rects
-GET_Rects(struct _glapi_table *disp)
-{
-    return (_glptr_Rects) (GET_by_offset(disp, _gloffset_Rects));
-}
-
-static inline void
-SET_Rects(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Rects, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Rectsv) (const GLshort *, const GLshort *);
-
-#define CALL_Rectsv(disp, parameters) \
-    (* GET_Rectsv(disp)) parameters
-static inline _glptr_Rectsv
-GET_Rectsv(struct _glapi_table *disp)
-{
-    return (_glptr_Rectsv) (GET_by_offset(disp, _gloffset_Rectsv));
-}
-
-static inline void
-SET_Rectsv(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (const GLshort *, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Rectsv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord1d) (GLdouble);
-
-#define CALL_TexCoord1d(disp, parameters) \
-    (* GET_TexCoord1d(disp)) parameters
-static inline _glptr_TexCoord1d
-GET_TexCoord1d(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1d) (GET_by_offset(disp, _gloffset_TexCoord1d));
-}
-
-static inline void
-SET_TexCoord1d(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLdouble))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord1dv) (const GLdouble *);
-
-#define CALL_TexCoord1dv(disp, parameters) \
-    (* GET_TexCoord1dv(disp)) parameters
-static inline _glptr_TexCoord1dv
-GET_TexCoord1dv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1dv) (GET_by_offset(disp, _gloffset_TexCoord1dv));
-}
-
-static inline void
-SET_TexCoord1dv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord1f) (GLfloat);
-
-#define CALL_TexCoord1f(disp, parameters) \
-    (* GET_TexCoord1f(disp)) parameters
-static inline _glptr_TexCoord1f
-GET_TexCoord1f(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1f) (GET_by_offset(disp, _gloffset_TexCoord1f));
-}
-
-static inline void
-SET_TexCoord1f(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord1fv) (const GLfloat *);
-
-#define CALL_TexCoord1fv(disp, parameters) \
-    (* GET_TexCoord1fv(disp)) parameters
-static inline _glptr_TexCoord1fv
-GET_TexCoord1fv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1fv) (GET_by_offset(disp, _gloffset_TexCoord1fv));
-}
-
-static inline void
-SET_TexCoord1fv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord1i) (GLint);
-
-#define CALL_TexCoord1i(disp, parameters) \
-    (* GET_TexCoord1i(disp)) parameters
-static inline _glptr_TexCoord1i
-GET_TexCoord1i(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1i) (GET_by_offset(disp, _gloffset_TexCoord1i));
-}
-
-static inline void
-SET_TexCoord1i(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord1iv) (const GLint *);
-
-#define CALL_TexCoord1iv(disp, parameters) \
-    (* GET_TexCoord1iv(disp)) parameters
-static inline _glptr_TexCoord1iv
-GET_TexCoord1iv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1iv) (GET_by_offset(disp, _gloffset_TexCoord1iv));
-}
-
-static inline void
-SET_TexCoord1iv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord1s) (GLshort);
-
-#define CALL_TexCoord1s(disp, parameters) \
-    (* GET_TexCoord1s(disp)) parameters
-static inline _glptr_TexCoord1s
-GET_TexCoord1s(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1s) (GET_by_offset(disp, _gloffset_TexCoord1s));
-}
-
-static inline void
-SET_TexCoord1s(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLshort))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord1sv) (const GLshort *);
-
-#define CALL_TexCoord1sv(disp, parameters) \
-    (* GET_TexCoord1sv(disp)) parameters
-static inline _glptr_TexCoord1sv
-GET_TexCoord1sv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1sv) (GET_by_offset(disp, _gloffset_TexCoord1sv));
-}
-
-static inline void
-SET_TexCoord1sv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord2d) (GLdouble, GLdouble);
-
-#define CALL_TexCoord2d(disp, parameters) \
-    (* GET_TexCoord2d(disp)) parameters
-static inline _glptr_TexCoord2d
-GET_TexCoord2d(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2d) (GET_by_offset(disp, _gloffset_TexCoord2d));
-}
-
-static inline void
-SET_TexCoord2d(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord2dv) (const GLdouble *);
-
-#define CALL_TexCoord2dv(disp, parameters) \
-    (* GET_TexCoord2dv(disp)) parameters
-static inline _glptr_TexCoord2dv
-GET_TexCoord2dv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2dv) (GET_by_offset(disp, _gloffset_TexCoord2dv));
-}
-
-static inline void
-SET_TexCoord2dv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord2f) (GLfloat, GLfloat);
-
-#define CALL_TexCoord2f(disp, parameters) \
-    (* GET_TexCoord2f(disp)) parameters
-static inline _glptr_TexCoord2f
-GET_TexCoord2f(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2f) (GET_by_offset(disp, _gloffset_TexCoord2f));
-}
-
-static inline void
-SET_TexCoord2f(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord2fv) (const GLfloat *);
-
-#define CALL_TexCoord2fv(disp, parameters) \
-    (* GET_TexCoord2fv(disp)) parameters
-static inline _glptr_TexCoord2fv
-GET_TexCoord2fv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2fv) (GET_by_offset(disp, _gloffset_TexCoord2fv));
-}
-
-static inline void
-SET_TexCoord2fv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord2i) (GLint, GLint);
-
-#define CALL_TexCoord2i(disp, parameters) \
-    (* GET_TexCoord2i(disp)) parameters
-static inline _glptr_TexCoord2i
-GET_TexCoord2i(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2i) (GET_by_offset(disp, _gloffset_TexCoord2i));
-}
-
-static inline void
-SET_TexCoord2i(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord2iv) (const GLint *);
-
-#define CALL_TexCoord2iv(disp, parameters) \
-    (* GET_TexCoord2iv(disp)) parameters
-static inline _glptr_TexCoord2iv
-GET_TexCoord2iv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2iv) (GET_by_offset(disp, _gloffset_TexCoord2iv));
-}
-
-static inline void
-SET_TexCoord2iv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord2s) (GLshort, GLshort);
-
-#define CALL_TexCoord2s(disp, parameters) \
-    (* GET_TexCoord2s(disp)) parameters
-static inline _glptr_TexCoord2s
-GET_TexCoord2s(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2s) (GET_by_offset(disp, _gloffset_TexCoord2s));
-}
-
-static inline void
-SET_TexCoord2s(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord2sv) (const GLshort *);
-
-#define CALL_TexCoord2sv(disp, parameters) \
-    (* GET_TexCoord2sv(disp)) parameters
-static inline _glptr_TexCoord2sv
-GET_TexCoord2sv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2sv) (GET_by_offset(disp, _gloffset_TexCoord2sv));
-}
-
-static inline void
-SET_TexCoord2sv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord3d) (GLdouble, GLdouble, GLdouble);
-
-#define CALL_TexCoord3d(disp, parameters) \
-    (* GET_TexCoord3d(disp)) parameters
-static inline _glptr_TexCoord3d
-GET_TexCoord3d(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3d) (GET_by_offset(disp, _gloffset_TexCoord3d));
-}
-
-static inline void
-SET_TexCoord3d(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord3dv) (const GLdouble *);
-
-#define CALL_TexCoord3dv(disp, parameters) \
-    (* GET_TexCoord3dv(disp)) parameters
-static inline _glptr_TexCoord3dv
-GET_TexCoord3dv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3dv) (GET_by_offset(disp, _gloffset_TexCoord3dv));
-}
-
-static inline void
-SET_TexCoord3dv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord3f) (GLfloat, GLfloat, GLfloat);
-
-#define CALL_TexCoord3f(disp, parameters) \
-    (* GET_TexCoord3f(disp)) parameters
-static inline _glptr_TexCoord3f
-GET_TexCoord3f(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3f) (GET_by_offset(disp, _gloffset_TexCoord3f));
-}
-
-static inline void
-SET_TexCoord3f(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord3fv) (const GLfloat *);
-
-#define CALL_TexCoord3fv(disp, parameters) \
-    (* GET_TexCoord3fv(disp)) parameters
-static inline _glptr_TexCoord3fv
-GET_TexCoord3fv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3fv) (GET_by_offset(disp, _gloffset_TexCoord3fv));
-}
-
-static inline void
-SET_TexCoord3fv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord3i) (GLint, GLint, GLint);
-
-#define CALL_TexCoord3i(disp, parameters) \
-    (* GET_TexCoord3i(disp)) parameters
-static inline _glptr_TexCoord3i
-GET_TexCoord3i(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3i) (GET_by_offset(disp, _gloffset_TexCoord3i));
-}
-
-static inline void
-SET_TexCoord3i(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord3iv) (const GLint *);
-
-#define CALL_TexCoord3iv(disp, parameters) \
-    (* GET_TexCoord3iv(disp)) parameters
-static inline _glptr_TexCoord3iv
-GET_TexCoord3iv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3iv) (GET_by_offset(disp, _gloffset_TexCoord3iv));
-}
-
-static inline void
-SET_TexCoord3iv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord3s) (GLshort, GLshort, GLshort);
-
-#define CALL_TexCoord3s(disp, parameters) \
-    (* GET_TexCoord3s(disp)) parameters
-static inline _glptr_TexCoord3s
-GET_TexCoord3s(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3s) (GET_by_offset(disp, _gloffset_TexCoord3s));
-}
-
-static inline void
-SET_TexCoord3s(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord3sv) (const GLshort *);
-
-#define CALL_TexCoord3sv(disp, parameters) \
-    (* GET_TexCoord3sv(disp)) parameters
-static inline _glptr_TexCoord3sv
-GET_TexCoord3sv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3sv) (GET_by_offset(disp, _gloffset_TexCoord3sv));
-}
-
-static inline void
-SET_TexCoord3sv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord4d) (GLdouble, GLdouble, GLdouble,
-                                              GLdouble);
-#define CALL_TexCoord4d(disp, parameters) \
-    (* GET_TexCoord4d(disp)) parameters
-static inline _glptr_TexCoord4d
-GET_TexCoord4d(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4d) (GET_by_offset(disp, _gloffset_TexCoord4d));
-}
-
-static inline void
-SET_TexCoord4d(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord4dv) (const GLdouble *);
-
-#define CALL_TexCoord4dv(disp, parameters) \
-    (* GET_TexCoord4dv(disp)) parameters
-static inline _glptr_TexCoord4dv
-GET_TexCoord4dv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4dv) (GET_by_offset(disp, _gloffset_TexCoord4dv));
-}
-
-static inline void
-SET_TexCoord4dv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord4f) (GLfloat, GLfloat, GLfloat,
-                                              GLfloat);
-#define CALL_TexCoord4f(disp, parameters) \
-    (* GET_TexCoord4f(disp)) parameters
-static inline _glptr_TexCoord4f
-GET_TexCoord4f(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4f) (GET_by_offset(disp, _gloffset_TexCoord4f));
-}
-
-static inline void
-SET_TexCoord4f(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord4fv) (const GLfloat *);
-
-#define CALL_TexCoord4fv(disp, parameters) \
-    (* GET_TexCoord4fv(disp)) parameters
-static inline _glptr_TexCoord4fv
-GET_TexCoord4fv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4fv) (GET_by_offset(disp, _gloffset_TexCoord4fv));
-}
-
-static inline void
-SET_TexCoord4fv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord4i) (GLint, GLint, GLint, GLint);
-
-#define CALL_TexCoord4i(disp, parameters) \
-    (* GET_TexCoord4i(disp)) parameters
-static inline _glptr_TexCoord4i
-GET_TexCoord4i(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4i) (GET_by_offset(disp, _gloffset_TexCoord4i));
-}
-
-static inline void
-SET_TexCoord4i(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord4iv) (const GLint *);
-
-#define CALL_TexCoord4iv(disp, parameters) \
-    (* GET_TexCoord4iv(disp)) parameters
-static inline _glptr_TexCoord4iv
-GET_TexCoord4iv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4iv) (GET_by_offset(disp, _gloffset_TexCoord4iv));
-}
-
-static inline void
-SET_TexCoord4iv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord4s) (GLshort, GLshort, GLshort,
-                                              GLshort);
-#define CALL_TexCoord4s(disp, parameters) \
-    (* GET_TexCoord4s(disp)) parameters
-static inline _glptr_TexCoord4s
-GET_TexCoord4s(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4s) (GET_by_offset(disp, _gloffset_TexCoord4s));
-}
-
-static inline void
-SET_TexCoord4s(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoord4sv) (const GLshort *);
-
-#define CALL_TexCoord4sv(disp, parameters) \
-    (* GET_TexCoord4sv(disp)) parameters
-static inline _glptr_TexCoord4sv
-GET_TexCoord4sv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4sv) (GET_by_offset(disp, _gloffset_TexCoord4sv));
-}
-
-static inline void
-SET_TexCoord4sv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex2d) (GLdouble, GLdouble);
-
-#define CALL_Vertex2d(disp, parameters) \
-    (* GET_Vertex2d(disp)) parameters
-static inline _glptr_Vertex2d
-GET_Vertex2d(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2d) (GET_by_offset(disp, _gloffset_Vertex2d));
-}
-
-static inline void
-SET_Vertex2d(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Vertex2d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex2dv) (const GLdouble *);
-
-#define CALL_Vertex2dv(disp, parameters) \
-    (* GET_Vertex2dv(disp)) parameters
-static inline _glptr_Vertex2dv
-GET_Vertex2dv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2dv) (GET_by_offset(disp, _gloffset_Vertex2dv));
-}
-
-static inline void
-SET_Vertex2dv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Vertex2dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex2f) (GLfloat, GLfloat);
-
-#define CALL_Vertex2f(disp, parameters) \
-    (* GET_Vertex2f(disp)) parameters
-static inline _glptr_Vertex2f
-GET_Vertex2f(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2f) (GET_by_offset(disp, _gloffset_Vertex2f));
-}
-
-static inline void
-SET_Vertex2f(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Vertex2f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex2fv) (const GLfloat *);
-
-#define CALL_Vertex2fv(disp, parameters) \
-    (* GET_Vertex2fv(disp)) parameters
-static inline _glptr_Vertex2fv
-GET_Vertex2fv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2fv) (GET_by_offset(disp, _gloffset_Vertex2fv));
-}
-
-static inline void
-SET_Vertex2fv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Vertex2fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex2i) (GLint, GLint);
-
-#define CALL_Vertex2i(disp, parameters) \
-    (* GET_Vertex2i(disp)) parameters
-static inline _glptr_Vertex2i
-GET_Vertex2i(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2i) (GET_by_offset(disp, _gloffset_Vertex2i));
-}
-
-static inline void
-SET_Vertex2i(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Vertex2i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex2iv) (const GLint *);
-
-#define CALL_Vertex2iv(disp, parameters) \
-    (* GET_Vertex2iv(disp)) parameters
-static inline _glptr_Vertex2iv
-GET_Vertex2iv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2iv) (GET_by_offset(disp, _gloffset_Vertex2iv));
-}
-
-static inline void
-SET_Vertex2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Vertex2iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex2s) (GLshort, GLshort);
-
-#define CALL_Vertex2s(disp, parameters) \
-    (* GET_Vertex2s(disp)) parameters
-static inline _glptr_Vertex2s
-GET_Vertex2s(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2s) (GET_by_offset(disp, _gloffset_Vertex2s));
-}
-
-static inline void
-SET_Vertex2s(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Vertex2s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex2sv) (const GLshort *);
-
-#define CALL_Vertex2sv(disp, parameters) \
-    (* GET_Vertex2sv(disp)) parameters
-static inline _glptr_Vertex2sv
-GET_Vertex2sv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2sv) (GET_by_offset(disp, _gloffset_Vertex2sv));
-}
-
-static inline void
-SET_Vertex2sv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Vertex2sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex3d) (GLdouble, GLdouble, GLdouble);
-
-#define CALL_Vertex3d(disp, parameters) \
-    (* GET_Vertex3d(disp)) parameters
-static inline _glptr_Vertex3d
-GET_Vertex3d(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3d) (GET_by_offset(disp, _gloffset_Vertex3d));
-}
-
-static inline void
-SET_Vertex3d(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Vertex3d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex3dv) (const GLdouble *);
-
-#define CALL_Vertex3dv(disp, parameters) \
-    (* GET_Vertex3dv(disp)) parameters
-static inline _glptr_Vertex3dv
-GET_Vertex3dv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3dv) (GET_by_offset(disp, _gloffset_Vertex3dv));
-}
-
-static inline void
-SET_Vertex3dv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Vertex3dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex3f) (GLfloat, GLfloat, GLfloat);
-
-#define CALL_Vertex3f(disp, parameters) \
-    (* GET_Vertex3f(disp)) parameters
-static inline _glptr_Vertex3f
-GET_Vertex3f(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3f) (GET_by_offset(disp, _gloffset_Vertex3f));
-}
-
-static inline void
-SET_Vertex3f(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Vertex3f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex3fv) (const GLfloat *);
-
-#define CALL_Vertex3fv(disp, parameters) \
-    (* GET_Vertex3fv(disp)) parameters
-static inline _glptr_Vertex3fv
-GET_Vertex3fv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3fv) (GET_by_offset(disp, _gloffset_Vertex3fv));
-}
-
-static inline void
-SET_Vertex3fv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Vertex3fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex3i) (GLint, GLint, GLint);
-
-#define CALL_Vertex3i(disp, parameters) \
-    (* GET_Vertex3i(disp)) parameters
-static inline _glptr_Vertex3i
-GET_Vertex3i(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3i) (GET_by_offset(disp, _gloffset_Vertex3i));
-}
-
-static inline void
-SET_Vertex3i(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Vertex3i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex3iv) (const GLint *);
-
-#define CALL_Vertex3iv(disp, parameters) \
-    (* GET_Vertex3iv(disp)) parameters
-static inline _glptr_Vertex3iv
-GET_Vertex3iv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3iv) (GET_by_offset(disp, _gloffset_Vertex3iv));
-}
-
-static inline void
-SET_Vertex3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Vertex3iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex3s) (GLshort, GLshort, GLshort);
-
-#define CALL_Vertex3s(disp, parameters) \
-    (* GET_Vertex3s(disp)) parameters
-static inline _glptr_Vertex3s
-GET_Vertex3s(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3s) (GET_by_offset(disp, _gloffset_Vertex3s));
-}
-
-static inline void
-SET_Vertex3s(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Vertex3s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex3sv) (const GLshort *);
-
-#define CALL_Vertex3sv(disp, parameters) \
-    (* GET_Vertex3sv(disp)) parameters
-static inline _glptr_Vertex3sv
-GET_Vertex3sv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3sv) (GET_by_offset(disp, _gloffset_Vertex3sv));
-}
-
-static inline void
-SET_Vertex3sv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Vertex3sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex4d) (GLdouble, GLdouble, GLdouble,
-                                            GLdouble);
-#define CALL_Vertex4d(disp, parameters) \
-    (* GET_Vertex4d(disp)) parameters
-static inline _glptr_Vertex4d
-GET_Vertex4d(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4d) (GET_by_offset(disp, _gloffset_Vertex4d));
-}
-
-static inline void
-SET_Vertex4d(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Vertex4d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex4dv) (const GLdouble *);
-
-#define CALL_Vertex4dv(disp, parameters) \
-    (* GET_Vertex4dv(disp)) parameters
-static inline _glptr_Vertex4dv
-GET_Vertex4dv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4dv) (GET_by_offset(disp, _gloffset_Vertex4dv));
-}
-
-static inline void
-SET_Vertex4dv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Vertex4dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex4f) (GLfloat, GLfloat, GLfloat, GLfloat);
-
-#define CALL_Vertex4f(disp, parameters) \
-    (* GET_Vertex4f(disp)) parameters
-static inline _glptr_Vertex4f
-GET_Vertex4f(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4f) (GET_by_offset(disp, _gloffset_Vertex4f));
-}
-
-static inline void
-SET_Vertex4f(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Vertex4f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex4fv) (const GLfloat *);
-
-#define CALL_Vertex4fv(disp, parameters) \
-    (* GET_Vertex4fv(disp)) parameters
-static inline _glptr_Vertex4fv
-GET_Vertex4fv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4fv) (GET_by_offset(disp, _gloffset_Vertex4fv));
-}
-
-static inline void
-SET_Vertex4fv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Vertex4fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex4i) (GLint, GLint, GLint, GLint);
-
-#define CALL_Vertex4i(disp, parameters) \
-    (* GET_Vertex4i(disp)) parameters
-static inline _glptr_Vertex4i
-GET_Vertex4i(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4i) (GET_by_offset(disp, _gloffset_Vertex4i));
-}
-
-static inline void
-SET_Vertex4i(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Vertex4i, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex4iv) (const GLint *);
-
-#define CALL_Vertex4iv(disp, parameters) \
-    (* GET_Vertex4iv(disp)) parameters
-static inline _glptr_Vertex4iv
-GET_Vertex4iv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4iv) (GET_by_offset(disp, _gloffset_Vertex4iv));
-}
-
-static inline void
-SET_Vertex4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Vertex4iv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex4s) (GLshort, GLshort, GLshort, GLshort);
-
-#define CALL_Vertex4s(disp, parameters) \
-    (* GET_Vertex4s(disp)) parameters
-static inline _glptr_Vertex4s
-GET_Vertex4s(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4s) (GET_by_offset(disp, _gloffset_Vertex4s));
-}
-
-static inline void
-SET_Vertex4s(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Vertex4s, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Vertex4sv) (const GLshort *);
-
-#define CALL_Vertex4sv(disp, parameters) \
-    (* GET_Vertex4sv(disp)) parameters
-static inline _glptr_Vertex4sv
-GET_Vertex4sv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4sv) (GET_by_offset(disp, _gloffset_Vertex4sv));
-}
-
-static inline void
-SET_Vertex4sv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Vertex4sv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClipPlane) (GLenum, const GLdouble *);
-
-#define CALL_ClipPlane(disp, parameters) \
-    (* GET_ClipPlane(disp)) parameters
-static inline _glptr_ClipPlane
-GET_ClipPlane(struct _glapi_table *disp)
-{
-    return (_glptr_ClipPlane) (GET_by_offset(disp, _gloffset_ClipPlane));
-}
-
-static inline void
-SET_ClipPlane(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_ClipPlane, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorMaterial) (GLenum, GLenum);
-
-#define CALL_ColorMaterial(disp, parameters) \
-    (* GET_ColorMaterial(disp)) parameters
-static inline _glptr_ColorMaterial
-GET_ColorMaterial(struct _glapi_table *disp)
-{
-    return (_glptr_ColorMaterial) (GET_by_offset
-                                   (disp, _gloffset_ColorMaterial));
-}
-
-static inline void
-SET_ColorMaterial(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_ColorMaterial, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CullFace) (GLenum);
-
-#define CALL_CullFace(disp, parameters) \
-    (* GET_CullFace(disp)) parameters
-static inline _glptr_CullFace
-GET_CullFace(struct _glapi_table *disp)
-{
-    return (_glptr_CullFace) (GET_by_offset(disp, _gloffset_CullFace));
-}
-
-static inline void
-SET_CullFace(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_CullFace, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Fogf) (GLenum, GLfloat);
-
-#define CALL_Fogf(disp, parameters) \
-    (* GET_Fogf(disp)) parameters
-static inline _glptr_Fogf
-GET_Fogf(struct _glapi_table *disp)
-{
-    return (_glptr_Fogf) (GET_by_offset(disp, _gloffset_Fogf));
-}
-
-static inline void
-SET_Fogf(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Fogf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Fogfv) (GLenum, const GLfloat *);
-
-#define CALL_Fogfv(disp, parameters) \
-    (* GET_Fogfv(disp)) parameters
-static inline _glptr_Fogfv
-GET_Fogfv(struct _glapi_table *disp)
-{
-    return (_glptr_Fogfv) (GET_by_offset(disp, _gloffset_Fogfv));
-}
-
-static inline void
-SET_Fogfv(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Fogfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Fogi) (GLenum, GLint);
-
-#define CALL_Fogi(disp, parameters) \
-    (* GET_Fogi(disp)) parameters
-static inline _glptr_Fogi
-GET_Fogi(struct _glapi_table *disp)
-{
-    return (_glptr_Fogi) (GET_by_offset(disp, _gloffset_Fogi));
-}
-
-static inline void
-SET_Fogi(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_Fogi, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Fogiv) (GLenum, const GLint *);
-
-#define CALL_Fogiv(disp, parameters) \
-    (* GET_Fogiv(disp)) parameters
-static inline _glptr_Fogiv
-GET_Fogiv(struct _glapi_table *disp)
-{
-    return (_glptr_Fogiv) (GET_by_offset(disp, _gloffset_Fogiv));
-}
-
-static inline void
-SET_Fogiv(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Fogiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FrontFace) (GLenum);
-
-#define CALL_FrontFace(disp, parameters) \
-    (* GET_FrontFace(disp)) parameters
-static inline _glptr_FrontFace
-GET_FrontFace(struct _glapi_table *disp)
-{
-    return (_glptr_FrontFace) (GET_by_offset(disp, _gloffset_FrontFace));
-}
-
-static inline void
-SET_FrontFace(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_FrontFace, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Hint) (GLenum, GLenum);
-
-#define CALL_Hint(disp, parameters) \
-    (* GET_Hint(disp)) parameters
-static inline _glptr_Hint
-GET_Hint(struct _glapi_table *disp)
-{
-    return (_glptr_Hint) (GET_by_offset(disp, _gloffset_Hint));
-}
-
-static inline void
-SET_Hint(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_Hint, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Lightf) (GLenum, GLenum, GLfloat);
-
-#define CALL_Lightf(disp, parameters) \
-    (* GET_Lightf(disp)) parameters
-static inline _glptr_Lightf
-GET_Lightf(struct _glapi_table *disp)
-{
-    return (_glptr_Lightf) (GET_by_offset(disp, _gloffset_Lightf));
-}
-
-static inline void
-SET_Lightf(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Lightf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Lightfv) (GLenum, GLenum, const GLfloat *);
-
-#define CALL_Lightfv(disp, parameters) \
-    (* GET_Lightfv(disp)) parameters
-static inline _glptr_Lightfv
-GET_Lightfv(struct _glapi_table *disp)
-{
-    return (_glptr_Lightfv) (GET_by_offset(disp, _gloffset_Lightfv));
-}
-
-static inline void
-SET_Lightfv(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Lightfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Lighti) (GLenum, GLenum, GLint);
-
-#define CALL_Lighti(disp, parameters) \
-    (* GET_Lighti(disp)) parameters
-static inline _glptr_Lighti
-GET_Lighti(struct _glapi_table *disp)
-{
-    return (_glptr_Lighti) (GET_by_offset(disp, _gloffset_Lighti));
-}
-
-static inline void
-SET_Lighti(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_Lighti, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Lightiv) (GLenum, GLenum, const GLint *);
-
-#define CALL_Lightiv(disp, parameters) \
-    (* GET_Lightiv(disp)) parameters
-static inline _glptr_Lightiv
-GET_Lightiv(struct _glapi_table *disp)
-{
-    return (_glptr_Lightiv) (GET_by_offset(disp, _gloffset_Lightiv));
-}
-
-static inline void
-SET_Lightiv(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Lightiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LightModelf) (GLenum, GLfloat);
-
-#define CALL_LightModelf(disp, parameters) \
-    (* GET_LightModelf(disp)) parameters
-static inline _glptr_LightModelf
-GET_LightModelf(struct _glapi_table *disp)
-{
-    return (_glptr_LightModelf) (GET_by_offset(disp, _gloffset_LightModelf));
-}
-
-static inline void
-SET_LightModelf(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_LightModelf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LightModelfv) (GLenum, const GLfloat *);
-
-#define CALL_LightModelfv(disp, parameters) \
-    (* GET_LightModelfv(disp)) parameters
-static inline _glptr_LightModelfv
-GET_LightModelfv(struct _glapi_table *disp)
-{
-    return (_glptr_LightModelfv) (GET_by_offset(disp, _gloffset_LightModelfv));
-}
-
-static inline void
-SET_LightModelfv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_LightModelfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LightModeli) (GLenum, GLint);
-
-#define CALL_LightModeli(disp, parameters) \
-    (* GET_LightModeli(disp)) parameters
-static inline _glptr_LightModeli
-GET_LightModeli(struct _glapi_table *disp)
-{
-    return (_glptr_LightModeli) (GET_by_offset(disp, _gloffset_LightModeli));
-}
-
-static inline void
-SET_LightModeli(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_LightModeli, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LightModeliv) (GLenum, const GLint *);
-
-#define CALL_LightModeliv(disp, parameters) \
-    (* GET_LightModeliv(disp)) parameters
-static inline _glptr_LightModeliv
-GET_LightModeliv(struct _glapi_table *disp)
-{
-    return (_glptr_LightModeliv) (GET_by_offset(disp, _gloffset_LightModeliv));
-}
-
-static inline void
-SET_LightModeliv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_LightModeliv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LineStipple) (GLint, GLushort);
-
-#define CALL_LineStipple(disp, parameters) \
-    (* GET_LineStipple(disp)) parameters
-static inline _glptr_LineStipple
-GET_LineStipple(struct _glapi_table *disp)
-{
-    return (_glptr_LineStipple) (GET_by_offset(disp, _gloffset_LineStipple));
-}
-
-static inline void
-SET_LineStipple(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLint, GLushort))
-{
-    SET_by_offset(disp, _gloffset_LineStipple, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LineWidth) (GLfloat);
-
-#define CALL_LineWidth(disp, parameters) \
-    (* GET_LineWidth(disp)) parameters
-static inline _glptr_LineWidth
-GET_LineWidth(struct _glapi_table *disp)
-{
-    return (_glptr_LineWidth) (GET_by_offset(disp, _gloffset_LineWidth));
-}
-
-static inline void
-SET_LineWidth(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_LineWidth, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Materialf) (GLenum, GLenum, GLfloat);
-
-#define CALL_Materialf(disp, parameters) \
-    (* GET_Materialf(disp)) parameters
-static inline _glptr_Materialf
-GET_Materialf(struct _glapi_table *disp)
-{
-    return (_glptr_Materialf) (GET_by_offset(disp, _gloffset_Materialf));
-}
-
-static inline void
-SET_Materialf(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Materialf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Materialfv) (GLenum, GLenum, const GLfloat *);
-
-#define CALL_Materialfv(disp, parameters) \
-    (* GET_Materialfv(disp)) parameters
-static inline _glptr_Materialfv
-GET_Materialfv(struct _glapi_table *disp)
-{
-    return (_glptr_Materialfv) (GET_by_offset(disp, _gloffset_Materialfv));
-}
-
-static inline void
-SET_Materialfv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Materialfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Materiali) (GLenum, GLenum, GLint);
-
-#define CALL_Materiali(disp, parameters) \
-    (* GET_Materiali(disp)) parameters
-static inline _glptr_Materiali
-GET_Materiali(struct _glapi_table *disp)
-{
-    return (_glptr_Materiali) (GET_by_offset(disp, _gloffset_Materiali));
-}
-
-static inline void
-SET_Materiali(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_Materiali, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Materialiv) (GLenum, GLenum, const GLint *);
-
-#define CALL_Materialiv(disp, parameters) \
-    (* GET_Materialiv(disp)) parameters
-static inline _glptr_Materialiv
-GET_Materialiv(struct _glapi_table *disp)
-{
-    return (_glptr_Materialiv) (GET_by_offset(disp, _gloffset_Materialiv));
-}
-
-static inline void
-SET_Materialiv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Materialiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PointSize) (GLfloat);
-
-#define CALL_PointSize(disp, parameters) \
-    (* GET_PointSize(disp)) parameters
-static inline _glptr_PointSize
-GET_PointSize(struct _glapi_table *disp)
-{
-    return (_glptr_PointSize) (GET_by_offset(disp, _gloffset_PointSize));
-}
-
-static inline void
-SET_PointSize(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PointSize, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PolygonMode) (GLenum, GLenum);
-
-#define CALL_PolygonMode(disp, parameters) \
-    (* GET_PolygonMode(disp)) parameters
-static inline _glptr_PolygonMode
-GET_PolygonMode(struct _glapi_table *disp)
-{
-    return (_glptr_PolygonMode) (GET_by_offset(disp, _gloffset_PolygonMode));
-}
-
-static inline void
-SET_PolygonMode(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_PolygonMode, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PolygonStipple) (const GLubyte *);
-
-#define CALL_PolygonStipple(disp, parameters) \
-    (* GET_PolygonStipple(disp)) parameters
-static inline _glptr_PolygonStipple
-GET_PolygonStipple(struct _glapi_table *disp)
-{
-    return (_glptr_PolygonStipple) (GET_by_offset
-                                    (disp, _gloffset_PolygonStipple));
-}
-
-static inline void
-SET_PolygonStipple(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_PolygonStipple, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Scissor) (GLint, GLint, GLsizei, GLsizei);
-
-#define CALL_Scissor(disp, parameters) \
-    (* GET_Scissor(disp)) parameters
-static inline _glptr_Scissor
-GET_Scissor(struct _glapi_table *disp)
-{
-    return (_glptr_Scissor) (GET_by_offset(disp, _gloffset_Scissor));
-}
-
-static inline void
-SET_Scissor(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLint, GLint, GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_Scissor, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ShadeModel) (GLenum);
-
-#define CALL_ShadeModel(disp, parameters) \
-    (* GET_ShadeModel(disp)) parameters
-static inline _glptr_ShadeModel
-GET_ShadeModel(struct _glapi_table *disp)
-{
-    return (_glptr_ShadeModel) (GET_by_offset(disp, _gloffset_ShadeModel));
-}
-
-static inline void
-SET_ShadeModel(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ShadeModel, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexParameterf) (GLenum, GLenum, GLfloat);
-
-#define CALL_TexParameterf(disp, parameters) \
-    (* GET_TexParameterf(disp)) parameters
-static inline _glptr_TexParameterf
-GET_TexParameterf(struct _glapi_table *disp)
-{
-    return (_glptr_TexParameterf) (GET_by_offset
-                                   (disp, _gloffset_TexParameterf));
-}
-
-static inline void
-SET_TexParameterf(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexParameterf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexParameterfv) (GLenum, GLenum,
-                                                  const GLfloat *);
-#define CALL_TexParameterfv(disp, parameters) \
-    (* GET_TexParameterfv(disp)) parameters
-static inline _glptr_TexParameterfv
-GET_TexParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_TexParameterfv) (GET_by_offset
-                                    (disp, _gloffset_TexParameterfv));
-}
-
-static inline void
-SET_TexParameterfv(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexParameterfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexParameteri) (GLenum, GLenum, GLint);
-
-#define CALL_TexParameteri(disp, parameters) \
-    (* GET_TexParameteri(disp)) parameters
-static inline _glptr_TexParameteri
-GET_TexParameteri(struct _glapi_table *disp)
-{
-    return (_glptr_TexParameteri) (GET_by_offset
-                                   (disp, _gloffset_TexParameteri));
-}
-
-static inline void
-SET_TexParameteri(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_TexParameteri, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexParameteriv) (GLenum, GLenum,
-                                                  const GLint *);
-#define CALL_TexParameteriv(disp, parameters) \
-    (* GET_TexParameteriv(disp)) parameters
-static inline _glptr_TexParameteriv
-GET_TexParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_TexParameteriv) (GET_by_offset
-                                    (disp, _gloffset_TexParameteriv));
-}
-
-static inline void
-SET_TexParameteriv(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexParameteriv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexImage1D) (GLenum, GLint, GLint, GLsizei,
-                                              GLint, GLenum, GLenum,
-                                              const GLvoid *);
-#define CALL_TexImage1D(disp, parameters) \
-    (* GET_TexImage1D(disp)) parameters
-static inline _glptr_TexImage1D
-GET_TexImage1D(struct _glapi_table *disp)
-{
-    return (_glptr_TexImage1D) (GET_by_offset(disp, _gloffset_TexImage1D));
-}
-
-static inline void
-SET_TexImage1D(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLsizei, GLint,
-                                      GLenum, GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexImage1D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexImage2D) (GLenum, GLint, GLint, GLsizei,
-                                              GLsizei, GLint, GLenum, GLenum,
-                                              const GLvoid *);
-#define CALL_TexImage2D(disp, parameters) \
-    (* GET_TexImage2D(disp)) parameters
-static inline _glptr_TexImage2D
-GET_TexImage2D(struct _glapi_table *disp)
-{
-    return (_glptr_TexImage2D) (GET_by_offset(disp, _gloffset_TexImage2D));
-}
-
-static inline void
-SET_TexImage2D(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLsizei, GLsizei,
-                                      GLint, GLenum, GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexImage2D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexEnvf) (GLenum, GLenum, GLfloat);
-
-#define CALL_TexEnvf(disp, parameters) \
-    (* GET_TexEnvf(disp)) parameters
-static inline _glptr_TexEnvf
-GET_TexEnvf(struct _glapi_table *disp)
-{
-    return (_glptr_TexEnvf) (GET_by_offset(disp, _gloffset_TexEnvf));
-}
-
-static inline void
-SET_TexEnvf(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexEnvf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexEnvfv) (GLenum, GLenum, const GLfloat *);
-
-#define CALL_TexEnvfv(disp, parameters) \
-    (* GET_TexEnvfv(disp)) parameters
-static inline _glptr_TexEnvfv
-GET_TexEnvfv(struct _glapi_table *disp)
-{
-    return (_glptr_TexEnvfv) (GET_by_offset(disp, _gloffset_TexEnvfv));
-}
-
-static inline void
-SET_TexEnvfv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexEnvfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexEnvi) (GLenum, GLenum, GLint);
-
-#define CALL_TexEnvi(disp, parameters) \
-    (* GET_TexEnvi(disp)) parameters
-static inline _glptr_TexEnvi
-GET_TexEnvi(struct _glapi_table *disp)
-{
-    return (_glptr_TexEnvi) (GET_by_offset(disp, _gloffset_TexEnvi));
-}
-
-static inline void
-SET_TexEnvi(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_TexEnvi, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexEnviv) (GLenum, GLenum, const GLint *);
-
-#define CALL_TexEnviv(disp, parameters) \
-    (* GET_TexEnviv(disp)) parameters
-static inline _glptr_TexEnviv
-GET_TexEnviv(struct _glapi_table *disp)
-{
-    return (_glptr_TexEnviv) (GET_by_offset(disp, _gloffset_TexEnviv));
-}
-
-static inline void
-SET_TexEnviv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexEnviv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexGend) (GLenum, GLenum, GLdouble);
-
-#define CALL_TexGend(disp, parameters) \
-    (* GET_TexGend(disp)) parameters
-static inline _glptr_TexGend
-GET_TexGend(struct _glapi_table *disp)
-{
-    return (_glptr_TexGend) (GET_by_offset(disp, _gloffset_TexGend));
-}
-
-static inline void
-SET_TexGend(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_TexGend, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexGendv) (GLenum, GLenum, const GLdouble *);
-
-#define CALL_TexGendv(disp, parameters) \
-    (* GET_TexGendv(disp)) parameters
-static inline _glptr_TexGendv
-GET_TexGendv(struct _glapi_table *disp)
-{
-    return (_glptr_TexGendv) (GET_by_offset(disp, _gloffset_TexGendv));
-}
-
-static inline void
-SET_TexGendv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_TexGendv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexGenf) (GLenum, GLenum, GLfloat);
-
-#define CALL_TexGenf(disp, parameters) \
-    (* GET_TexGenf(disp)) parameters
-static inline _glptr_TexGenf
-GET_TexGenf(struct _glapi_table *disp)
-{
-    return (_glptr_TexGenf) (GET_by_offset(disp, _gloffset_TexGenf));
-}
-
-static inline void
-SET_TexGenf(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexGenf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexGenfv) (GLenum, GLenum, const GLfloat *);
-
-#define CALL_TexGenfv(disp, parameters) \
-    (* GET_TexGenfv(disp)) parameters
-static inline _glptr_TexGenfv
-GET_TexGenfv(struct _glapi_table *disp)
-{
-    return (_glptr_TexGenfv) (GET_by_offset(disp, _gloffset_TexGenfv));
-}
-
-static inline void
-SET_TexGenfv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexGenfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexGeni) (GLenum, GLenum, GLint);
-
-#define CALL_TexGeni(disp, parameters) \
-    (* GET_TexGeni(disp)) parameters
-static inline _glptr_TexGeni
-GET_TexGeni(struct _glapi_table *disp)
-{
-    return (_glptr_TexGeni) (GET_by_offset(disp, _gloffset_TexGeni));
-}
-
-static inline void
-SET_TexGeni(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_TexGeni, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexGeniv) (GLenum, GLenum, const GLint *);
-
-#define CALL_TexGeniv(disp, parameters) \
-    (* GET_TexGeniv(disp)) parameters
-static inline _glptr_TexGeniv
-GET_TexGeniv(struct _glapi_table *disp)
-{
-    return (_glptr_TexGeniv) (GET_by_offset(disp, _gloffset_TexGeniv));
-}
-
-static inline void
-SET_TexGeniv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexGeniv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FeedbackBuffer) (GLsizei, GLenum, GLfloat *);
-
-#define CALL_FeedbackBuffer(disp, parameters) \
-    (* GET_FeedbackBuffer(disp)) parameters
-static inline _glptr_FeedbackBuffer
-GET_FeedbackBuffer(struct _glapi_table *disp)
-{
-    return (_glptr_FeedbackBuffer) (GET_by_offset
-                                    (disp, _gloffset_FeedbackBuffer));
-}
-
-static inline void
-SET_FeedbackBuffer(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLsizei, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_FeedbackBuffer, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SelectBuffer) (GLsizei, GLuint *);
-
-#define CALL_SelectBuffer(disp, parameters) \
-    (* GET_SelectBuffer(disp)) parameters
-static inline _glptr_SelectBuffer
-GET_SelectBuffer(struct _glapi_table *disp)
-{
-    return (_glptr_SelectBuffer) (GET_by_offset(disp, _gloffset_SelectBuffer));
-}
-
-static inline void
-SET_SelectBuffer(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_SelectBuffer, fn);
-}
-
-typedef GLint(GLAPIENTRYP _glptr_RenderMode) (GLenum);
-
-#define CALL_RenderMode(disp, parameters) \
-    (* GET_RenderMode(disp)) parameters
-static inline _glptr_RenderMode
-GET_RenderMode(struct _glapi_table *disp)
-{
-    return (_glptr_RenderMode) (GET_by_offset(disp, _gloffset_RenderMode));
-}
-
-static inline void
-SET_RenderMode(struct _glapi_table *disp, GLint(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_RenderMode, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_InitNames) (void);
-
-#define CALL_InitNames(disp, parameters) \
-    (* GET_InitNames(disp)) parameters
-static inline _glptr_InitNames
-GET_InitNames(struct _glapi_table *disp)
-{
-    return (_glptr_InitNames) (GET_by_offset(disp, _gloffset_InitNames));
-}
-
-static inline void
-SET_InitNames(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_InitNames, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LoadName) (GLuint);
-
-#define CALL_LoadName(disp, parameters) \
-    (* GET_LoadName(disp)) parameters
-static inline _glptr_LoadName
-GET_LoadName(struct _glapi_table *disp)
-{
-    return (_glptr_LoadName) (GET_by_offset(disp, _gloffset_LoadName));
-}
-
-static inline void
-SET_LoadName(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_LoadName, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PassThrough) (GLfloat);
-
-#define CALL_PassThrough(disp, parameters) \
-    (* GET_PassThrough(disp)) parameters
-static inline _glptr_PassThrough
-GET_PassThrough(struct _glapi_table *disp)
-{
-    return (_glptr_PassThrough) (GET_by_offset(disp, _gloffset_PassThrough));
-}
-
-static inline void
-SET_PassThrough(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PassThrough, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PopName) (void);
-
-#define CALL_PopName(disp, parameters) \
-    (* GET_PopName(disp)) parameters
-static inline _glptr_PopName
-GET_PopName(struct _glapi_table *disp)
-{
-    return (_glptr_PopName) (GET_by_offset(disp, _gloffset_PopName));
-}
-
-static inline void
-SET_PopName(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PopName, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PushName) (GLuint);
-
-#define CALL_PushName(disp, parameters) \
-    (* GET_PushName(disp)) parameters
-static inline _glptr_PushName
-GET_PushName(struct _glapi_table *disp)
-{
-    return (_glptr_PushName) (GET_by_offset(disp, _gloffset_PushName));
-}
-
-static inline void
-SET_PushName(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_PushName, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawBuffer) (GLenum);
-
-#define CALL_DrawBuffer(disp, parameters) \
-    (* GET_DrawBuffer(disp)) parameters
-static inline _glptr_DrawBuffer
-GET_DrawBuffer(struct _glapi_table *disp)
-{
-    return (_glptr_DrawBuffer) (GET_by_offset(disp, _gloffset_DrawBuffer));
-}
-
-static inline void
-SET_DrawBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_DrawBuffer, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Clear) (GLbitfield);
-
-#define CALL_Clear(disp, parameters) \
-    (* GET_Clear(disp)) parameters
-static inline _glptr_Clear
-GET_Clear(struct _glapi_table *disp)
-{
-    return (_glptr_Clear) (GET_by_offset(disp, _gloffset_Clear));
-}
-
-static inline void
-SET_Clear(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLbitfield))
-{
-    SET_by_offset(disp, _gloffset_Clear, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClearAccum) (GLfloat, GLfloat, GLfloat,
-                                              GLfloat);
-#define CALL_ClearAccum(disp, parameters) \
-    (* GET_ClearAccum(disp)) parameters
-static inline _glptr_ClearAccum
-GET_ClearAccum(struct _glapi_table *disp)
-{
-    return (_glptr_ClearAccum) (GET_by_offset(disp, _gloffset_ClearAccum));
-}
-
-static inline void
-SET_ClearAccum(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_ClearAccum, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClearIndex) (GLfloat);
-
-#define CALL_ClearIndex(disp, parameters) \
-    (* GET_ClearIndex(disp)) parameters
-static inline _glptr_ClearIndex
-GET_ClearIndex(struct _glapi_table *disp)
-{
-    return (_glptr_ClearIndex) (GET_by_offset(disp, _gloffset_ClearIndex));
-}
-
-static inline void
-SET_ClearIndex(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_ClearIndex, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClearColor) (GLclampf, GLclampf, GLclampf,
-                                              GLclampf);
-#define CALL_ClearColor(disp, parameters) \
-    (* GET_ClearColor(disp)) parameters
-static inline _glptr_ClearColor
-GET_ClearColor(struct _glapi_table *disp)
-{
-    return (_glptr_ClearColor) (GET_by_offset(disp, _gloffset_ClearColor));
-}
-
-static inline void
-SET_ClearColor(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLclampf, GLclampf, GLclampf, GLclampf))
-{
-    SET_by_offset(disp, _gloffset_ClearColor, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClearStencil) (GLint);
-
-#define CALL_ClearStencil(disp, parameters) \
-    (* GET_ClearStencil(disp)) parameters
-static inline _glptr_ClearStencil
-GET_ClearStencil(struct _glapi_table *disp)
-{
-    return (_glptr_ClearStencil) (GET_by_offset(disp, _gloffset_ClearStencil));
-}
-
-static inline void
-SET_ClearStencil(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint))
-{
-    SET_by_offset(disp, _gloffset_ClearStencil, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClearDepth) (GLclampd);
-
-#define CALL_ClearDepth(disp, parameters) \
-    (* GET_ClearDepth(disp)) parameters
-static inline _glptr_ClearDepth
-GET_ClearDepth(struct _glapi_table *disp)
-{
-    return (_glptr_ClearDepth) (GET_by_offset(disp, _gloffset_ClearDepth));
-}
-
-static inline void
-SET_ClearDepth(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLclampd))
-{
-    SET_by_offset(disp, _gloffset_ClearDepth, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_StencilMask) (GLuint);
-
-#define CALL_StencilMask(disp, parameters) \
-    (* GET_StencilMask(disp)) parameters
-static inline _glptr_StencilMask
-GET_StencilMask(struct _glapi_table *disp)
-{
-    return (_glptr_StencilMask) (GET_by_offset(disp, _gloffset_StencilMask));
-}
-
-static inline void
-SET_StencilMask(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_StencilMask, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorMask) (GLboolean, GLboolean, GLboolean,
-                                             GLboolean);
-#define CALL_ColorMask(disp, parameters) \
-    (* GET_ColorMask(disp)) parameters
-static inline _glptr_ColorMask
-GET_ColorMask(struct _glapi_table *disp)
-{
-    return (_glptr_ColorMask) (GET_by_offset(disp, _gloffset_ColorMask));
-}
-
-static inline void
-SET_ColorMask(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLboolean, GLboolean, GLboolean,
-                                     GLboolean))
-{
-    SET_by_offset(disp, _gloffset_ColorMask, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DepthMask) (GLboolean);
-
-#define CALL_DepthMask(disp, parameters) \
-    (* GET_DepthMask(disp)) parameters
-static inline _glptr_DepthMask
-GET_DepthMask(struct _glapi_table *disp)
-{
-    return (_glptr_DepthMask) (GET_by_offset(disp, _gloffset_DepthMask));
-}
-
-static inline void
-SET_DepthMask(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLboolean))
-{
-    SET_by_offset(disp, _gloffset_DepthMask, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_IndexMask) (GLuint);
-
-#define CALL_IndexMask(disp, parameters) \
-    (* GET_IndexMask(disp)) parameters
-static inline _glptr_IndexMask
-GET_IndexMask(struct _glapi_table *disp)
-{
-    return (_glptr_IndexMask) (GET_by_offset(disp, _gloffset_IndexMask));
-}
-
-static inline void
-SET_IndexMask(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IndexMask, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Accum) (GLenum, GLfloat);
-
-#define CALL_Accum(disp, parameters) \
-    (* GET_Accum(disp)) parameters
-static inline _glptr_Accum
-GET_Accum(struct _glapi_table *disp)
-{
-    return (_glptr_Accum) (GET_by_offset(disp, _gloffset_Accum));
-}
-
-static inline void
-SET_Accum(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Accum, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Disable) (GLenum);
-
-#define CALL_Disable(disp, parameters) \
-    (* GET_Disable(disp)) parameters
-static inline _glptr_Disable
-GET_Disable(struct _glapi_table *disp)
-{
-    return (_glptr_Disable) (GET_by_offset(disp, _gloffset_Disable));
-}
-
-static inline void
-SET_Disable(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_Disable, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Enable) (GLenum);
-
-#define CALL_Enable(disp, parameters) \
-    (* GET_Enable(disp)) parameters
-static inline _glptr_Enable
-GET_Enable(struct _glapi_table *disp)
-{
-    return (_glptr_Enable) (GET_by_offset(disp, _gloffset_Enable));
-}
-
-static inline void
-SET_Enable(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_Enable, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Finish) (void);
-
-#define CALL_Finish(disp, parameters) \
-    (* GET_Finish(disp)) parameters
-static inline _glptr_Finish
-GET_Finish(struct _glapi_table *disp)
-{
-    return (_glptr_Finish) (GET_by_offset(disp, _gloffset_Finish));
-}
-
-static inline void
-SET_Finish(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_Finish, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Flush) (void);
-
-#define CALL_Flush(disp, parameters) \
-    (* GET_Flush(disp)) parameters
-static inline _glptr_Flush
-GET_Flush(struct _glapi_table *disp)
-{
-    return (_glptr_Flush) (GET_by_offset(disp, _gloffset_Flush));
-}
-
-static inline void
-SET_Flush(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_Flush, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PopAttrib) (void);
-
-#define CALL_PopAttrib(disp, parameters) \
-    (* GET_PopAttrib(disp)) parameters
-static inline _glptr_PopAttrib
-GET_PopAttrib(struct _glapi_table *disp)
-{
-    return (_glptr_PopAttrib) (GET_by_offset(disp, _gloffset_PopAttrib));
-}
-
-static inline void
-SET_PopAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PopAttrib, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PushAttrib) (GLbitfield);
-
-#define CALL_PushAttrib(disp, parameters) \
-    (* GET_PushAttrib(disp)) parameters
-static inline _glptr_PushAttrib
-GET_PushAttrib(struct _glapi_table *disp)
-{
-    return (_glptr_PushAttrib) (GET_by_offset(disp, _gloffset_PushAttrib));
-}
-
-static inline void
-SET_PushAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLbitfield))
-{
-    SET_by_offset(disp, _gloffset_PushAttrib, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Map1d) (GLenum, GLdouble, GLdouble, GLint,
-                                         GLint, const GLdouble *);
-#define CALL_Map1d(disp, parameters) \
-    (* GET_Map1d(disp)) parameters
-static inline _glptr_Map1d
-GET_Map1d(struct _glapi_table *disp)
-{
-    return (_glptr_Map1d) (GET_by_offset(disp, _gloffset_Map1d));
-}
-
-static inline void
-SET_Map1d(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLenum, GLdouble, GLdouble, GLint, GLint,
-                                 const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Map1d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Map1f) (GLenum, GLfloat, GLfloat, GLint, GLint,
-                                         const GLfloat *);
-#define CALL_Map1f(disp, parameters) \
-    (* GET_Map1f(disp)) parameters
-static inline _glptr_Map1f
-GET_Map1f(struct _glapi_table *disp)
-{
-    return (_glptr_Map1f) (GET_by_offset(disp, _gloffset_Map1f));
-}
-
-static inline void
-SET_Map1f(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLenum, GLfloat, GLfloat, GLint, GLint,
-                                 const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Map1f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Map2d) (GLenum, GLdouble, GLdouble, GLint,
-                                         GLint, GLdouble, GLdouble, GLint,
-                                         GLint, const GLdouble *);
-#define CALL_Map2d(disp, parameters) \
-    (* GET_Map2d(disp)) parameters
-static inline _glptr_Map2d
-GET_Map2d(struct _glapi_table *disp)
-{
-    return (_glptr_Map2d) (GET_by_offset(disp, _gloffset_Map2d));
-}
-
-static inline void
-SET_Map2d(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLenum, GLdouble, GLdouble, GLint, GLint,
-                                 GLdouble, GLdouble, GLint, GLint,
-                                 const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Map2d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Map2f) (GLenum, GLfloat, GLfloat, GLint, GLint,
-                                         GLfloat, GLfloat, GLint, GLint,
-                                         const GLfloat *);
-#define CALL_Map2f(disp, parameters) \
-    (* GET_Map2f(disp)) parameters
-static inline _glptr_Map2f
-GET_Map2f(struct _glapi_table *disp)
-{
-    return (_glptr_Map2f) (GET_by_offset(disp, _gloffset_Map2f));
-}
-
-static inline void
-SET_Map2f(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLenum, GLfloat, GLfloat, GLint, GLint,
-                                 GLfloat, GLfloat, GLint, GLint,
-                                 const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Map2f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MapGrid1d) (GLint, GLdouble, GLdouble);
-
-#define CALL_MapGrid1d(disp, parameters) \
-    (* GET_MapGrid1d(disp)) parameters
-static inline _glptr_MapGrid1d
-GET_MapGrid1d(struct _glapi_table *disp)
-{
-    return (_glptr_MapGrid1d) (GET_by_offset(disp, _gloffset_MapGrid1d));
-}
-
-static inline void
-SET_MapGrid1d(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLint, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_MapGrid1d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MapGrid1f) (GLint, GLfloat, GLfloat);
-
-#define CALL_MapGrid1f(disp, parameters) \
-    (* GET_MapGrid1f(disp)) parameters
-static inline _glptr_MapGrid1f
-GET_MapGrid1f(struct _glapi_table *disp)
-{
-    return (_glptr_MapGrid1f) (GET_by_offset(disp, _gloffset_MapGrid1f));
-}
-
-static inline void
-SET_MapGrid1f(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLint, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_MapGrid1f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MapGrid2d) (GLint, GLdouble, GLdouble, GLint,
-                                             GLdouble, GLdouble);
-#define CALL_MapGrid2d(disp, parameters) \
-    (* GET_MapGrid2d(disp)) parameters
-static inline _glptr_MapGrid2d
-GET_MapGrid2d(struct _glapi_table *disp)
-{
-    return (_glptr_MapGrid2d) (GET_by_offset(disp, _gloffset_MapGrid2d));
-}
-
-static inline void
-SET_MapGrid2d(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLint, GLdouble, GLdouble, GLint, GLdouble,
-                                     GLdouble))
-{
-    SET_by_offset(disp, _gloffset_MapGrid2d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MapGrid2f) (GLint, GLfloat, GLfloat, GLint,
-                                             GLfloat, GLfloat);
-#define CALL_MapGrid2f(disp, parameters) \
-    (* GET_MapGrid2f(disp)) parameters
-static inline _glptr_MapGrid2f
-GET_MapGrid2f(struct _glapi_table *disp)
-{
-    return (_glptr_MapGrid2f) (GET_by_offset(disp, _gloffset_MapGrid2f));
-}
-
-static inline void
-SET_MapGrid2f(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLint, GLfloat, GLfloat, GLint, GLfloat,
-                                     GLfloat))
-{
-    SET_by_offset(disp, _gloffset_MapGrid2f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EvalCoord1d) (GLdouble);
-
-#define CALL_EvalCoord1d(disp, parameters) \
-    (* GET_EvalCoord1d(disp)) parameters
-static inline _glptr_EvalCoord1d
-GET_EvalCoord1d(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord1d) (GET_by_offset(disp, _gloffset_EvalCoord1d));
-}
-
-static inline void
-SET_EvalCoord1d(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLdouble))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord1d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EvalCoord1dv) (const GLdouble *);
-
-#define CALL_EvalCoord1dv(disp, parameters) \
-    (* GET_EvalCoord1dv(disp)) parameters
-static inline _glptr_EvalCoord1dv
-GET_EvalCoord1dv(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord1dv) (GET_by_offset(disp, _gloffset_EvalCoord1dv));
-}
-
-static inline void
-SET_EvalCoord1dv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord1dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EvalCoord1f) (GLfloat);
-
-#define CALL_EvalCoord1f(disp, parameters) \
-    (* GET_EvalCoord1f(disp)) parameters
-static inline _glptr_EvalCoord1f
-GET_EvalCoord1f(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord1f) (GET_by_offset(disp, _gloffset_EvalCoord1f));
-}
-
-static inline void
-SET_EvalCoord1f(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord1f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EvalCoord1fv) (const GLfloat *);
-
-#define CALL_EvalCoord1fv(disp, parameters) \
-    (* GET_EvalCoord1fv(disp)) parameters
-static inline _glptr_EvalCoord1fv
-GET_EvalCoord1fv(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord1fv) (GET_by_offset(disp, _gloffset_EvalCoord1fv));
-}
-
-static inline void
-SET_EvalCoord1fv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord1fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EvalCoord2d) (GLdouble, GLdouble);
-
-#define CALL_EvalCoord2d(disp, parameters) \
-    (* GET_EvalCoord2d(disp)) parameters
-static inline _glptr_EvalCoord2d
-GET_EvalCoord2d(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord2d) (GET_by_offset(disp, _gloffset_EvalCoord2d));
-}
-
-static inline void
-SET_EvalCoord2d(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord2d, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EvalCoord2dv) (const GLdouble *);
-
-#define CALL_EvalCoord2dv(disp, parameters) \
-    (* GET_EvalCoord2dv(disp)) parameters
-static inline _glptr_EvalCoord2dv
-GET_EvalCoord2dv(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord2dv) (GET_by_offset(disp, _gloffset_EvalCoord2dv));
-}
-
-static inline void
-SET_EvalCoord2dv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord2dv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EvalCoord2f) (GLfloat, GLfloat);
-
-#define CALL_EvalCoord2f(disp, parameters) \
-    (* GET_EvalCoord2f(disp)) parameters
-static inline _glptr_EvalCoord2f
-GET_EvalCoord2f(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord2f) (GET_by_offset(disp, _gloffset_EvalCoord2f));
-}
-
-static inline void
-SET_EvalCoord2f(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord2f, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EvalCoord2fv) (const GLfloat *);
-
-#define CALL_EvalCoord2fv(disp, parameters) \
-    (* GET_EvalCoord2fv(disp)) parameters
-static inline _glptr_EvalCoord2fv
-GET_EvalCoord2fv(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord2fv) (GET_by_offset(disp, _gloffset_EvalCoord2fv));
-}
-
-static inline void
-SET_EvalCoord2fv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord2fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EvalMesh1) (GLenum, GLint, GLint);
-
-#define CALL_EvalMesh1(disp, parameters) \
-    (* GET_EvalMesh1(disp)) parameters
-static inline _glptr_EvalMesh1
-GET_EvalMesh1(struct _glapi_table *disp)
-{
-    return (_glptr_EvalMesh1) (GET_by_offset(disp, _gloffset_EvalMesh1));
-}
-
-static inline void
-SET_EvalMesh1(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_EvalMesh1, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EvalPoint1) (GLint);
-
-#define CALL_EvalPoint1(disp, parameters) \
-    (* GET_EvalPoint1(disp)) parameters
-static inline _glptr_EvalPoint1
-GET_EvalPoint1(struct _glapi_table *disp)
-{
-    return (_glptr_EvalPoint1) (GET_by_offset(disp, _gloffset_EvalPoint1));
-}
-
-static inline void
-SET_EvalPoint1(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint))
-{
-    SET_by_offset(disp, _gloffset_EvalPoint1, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EvalMesh2) (GLenum, GLint, GLint, GLint,
-                                             GLint);
-#define CALL_EvalMesh2(disp, parameters) \
-    (* GET_EvalMesh2(disp)) parameters
-static inline _glptr_EvalMesh2
-GET_EvalMesh2(struct _glapi_table *disp)
-{
-    return (_glptr_EvalMesh2) (GET_by_offset(disp, _gloffset_EvalMesh2));
-}
-
-static inline void
-SET_EvalMesh2(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_EvalMesh2, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EvalPoint2) (GLint, GLint);
-
-#define CALL_EvalPoint2(disp, parameters) \
-    (* GET_EvalPoint2(disp)) parameters
-static inline _glptr_EvalPoint2
-GET_EvalPoint2(struct _glapi_table *disp)
-{
-    return (_glptr_EvalPoint2) (GET_by_offset(disp, _gloffset_EvalPoint2));
-}
-
-static inline void
-SET_EvalPoint2(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_EvalPoint2, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_AlphaFunc) (GLenum, GLclampf);
-
-#define CALL_AlphaFunc(disp, parameters) \
-    (* GET_AlphaFunc(disp)) parameters
-static inline _glptr_AlphaFunc
-GET_AlphaFunc(struct _glapi_table *disp)
-{
-    return (_glptr_AlphaFunc) (GET_by_offset(disp, _gloffset_AlphaFunc));
-}
-
-static inline void
-SET_AlphaFunc(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLclampf))
-{
-    SET_by_offset(disp, _gloffset_AlphaFunc, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BlendFunc) (GLenum, GLenum);
-
-#define CALL_BlendFunc(disp, parameters) \
-    (* GET_BlendFunc(disp)) parameters
-static inline _glptr_BlendFunc
-GET_BlendFunc(struct _glapi_table *disp)
-{
-    return (_glptr_BlendFunc) (GET_by_offset(disp, _gloffset_BlendFunc));
-}
-
-static inline void
-SET_BlendFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendFunc, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LogicOp) (GLenum);
-
-#define CALL_LogicOp(disp, parameters) \
-    (* GET_LogicOp(disp)) parameters
-static inline _glptr_LogicOp
-GET_LogicOp(struct _glapi_table *disp)
-{
-    return (_glptr_LogicOp) (GET_by_offset(disp, _gloffset_LogicOp));
-}
-
-static inline void
-SET_LogicOp(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_LogicOp, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_StencilFunc) (GLenum, GLint, GLuint);
-
-#define CALL_StencilFunc(disp, parameters) \
-    (* GET_StencilFunc(disp)) parameters
-static inline _glptr_StencilFunc
-GET_StencilFunc(struct _glapi_table *disp)
-{
-    return (_glptr_StencilFunc) (GET_by_offset(disp, _gloffset_StencilFunc));
-}
-
-static inline void
-SET_StencilFunc(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_StencilFunc, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_StencilOp) (GLenum, GLenum, GLenum);
-
-#define CALL_StencilOp(disp, parameters) \
-    (* GET_StencilOp(disp)) parameters
-static inline _glptr_StencilOp
-GET_StencilOp(struct _glapi_table *disp)
-{
-    return (_glptr_StencilOp) (GET_by_offset(disp, _gloffset_StencilOp));
-}
-
-static inline void
-SET_StencilOp(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_StencilOp, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DepthFunc) (GLenum);
-
-#define CALL_DepthFunc(disp, parameters) \
-    (* GET_DepthFunc(disp)) parameters
-static inline _glptr_DepthFunc
-GET_DepthFunc(struct _glapi_table *disp)
-{
-    return (_glptr_DepthFunc) (GET_by_offset(disp, _gloffset_DepthFunc));
-}
-
-static inline void
-SET_DepthFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_DepthFunc, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelZoom) (GLfloat, GLfloat);
-
-#define CALL_PixelZoom(disp, parameters) \
-    (* GET_PixelZoom(disp)) parameters
-static inline _glptr_PixelZoom
-GET_PixelZoom(struct _glapi_table *disp)
-{
-    return (_glptr_PixelZoom) (GET_by_offset(disp, _gloffset_PixelZoom));
-}
-
-static inline void
-SET_PixelZoom(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PixelZoom, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelTransferf) (GLenum, GLfloat);
-
-#define CALL_PixelTransferf(disp, parameters) \
-    (* GET_PixelTransferf(disp)) parameters
-static inline _glptr_PixelTransferf
-GET_PixelTransferf(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTransferf) (GET_by_offset
-                                    (disp, _gloffset_PixelTransferf));
-}
-
-static inline void
-SET_PixelTransferf(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PixelTransferf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelTransferi) (GLenum, GLint);
-
-#define CALL_PixelTransferi(disp, parameters) \
-    (* GET_PixelTransferi(disp)) parameters
-static inline _glptr_PixelTransferi
-GET_PixelTransferi(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTransferi) (GET_by_offset
-                                    (disp, _gloffset_PixelTransferi));
-}
-
-static inline void
-SET_PixelTransferi(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_PixelTransferi, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelStoref) (GLenum, GLfloat);
-
-#define CALL_PixelStoref(disp, parameters) \
-    (* GET_PixelStoref(disp)) parameters
-static inline _glptr_PixelStoref
-GET_PixelStoref(struct _glapi_table *disp)
-{
-    return (_glptr_PixelStoref) (GET_by_offset(disp, _gloffset_PixelStoref));
-}
-
-static inline void
-SET_PixelStoref(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PixelStoref, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelStorei) (GLenum, GLint);
-
-#define CALL_PixelStorei(disp, parameters) \
-    (* GET_PixelStorei(disp)) parameters
-static inline _glptr_PixelStorei
-GET_PixelStorei(struct _glapi_table *disp)
-{
-    return (_glptr_PixelStorei) (GET_by_offset(disp, _gloffset_PixelStorei));
-}
-
-static inline void
-SET_PixelStorei(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_PixelStorei, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelMapfv) (GLenum, GLsizei, const GLfloat *);
-
-#define CALL_PixelMapfv(disp, parameters) \
-    (* GET_PixelMapfv(disp)) parameters
-static inline _glptr_PixelMapfv
-GET_PixelMapfv(struct _glapi_table *disp)
-{
-    return (_glptr_PixelMapfv) (GET_by_offset(disp, _gloffset_PixelMapfv));
-}
-
-static inline void
-SET_PixelMapfv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_PixelMapfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelMapuiv) (GLenum, GLsizei, const GLuint *);
-
-#define CALL_PixelMapuiv(disp, parameters) \
-    (* GET_PixelMapuiv(disp)) parameters
-static inline _glptr_PixelMapuiv
-GET_PixelMapuiv(struct _glapi_table *disp)
-{
-    return (_glptr_PixelMapuiv) (GET_by_offset(disp, _gloffset_PixelMapuiv));
-}
-
-static inline void
-SET_PixelMapuiv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_PixelMapuiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelMapusv) (GLenum, GLsizei,
-                                               const GLushort *);
-#define CALL_PixelMapusv(disp, parameters) \
-    (* GET_PixelMapusv(disp)) parameters
-static inline _glptr_PixelMapusv
-GET_PixelMapusv(struct _glapi_table *disp)
-{
-    return (_glptr_PixelMapusv) (GET_by_offset(disp, _gloffset_PixelMapusv));
-}
-
-static inline void
-SET_PixelMapusv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_PixelMapusv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ReadBuffer) (GLenum);
-
-#define CALL_ReadBuffer(disp, parameters) \
-    (* GET_ReadBuffer(disp)) parameters
-static inline _glptr_ReadBuffer
-GET_ReadBuffer(struct _glapi_table *disp)
-{
-    return (_glptr_ReadBuffer) (GET_by_offset(disp, _gloffset_ReadBuffer));
-}
-
-static inline void
-SET_ReadBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ReadBuffer, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CopyPixels) (GLint, GLint, GLsizei, GLsizei,
-                                              GLenum);
-#define CALL_CopyPixels(disp, parameters) \
-    (* GET_CopyPixels(disp)) parameters
-static inline _glptr_CopyPixels
-GET_CopyPixels(struct _glapi_table *disp)
-{
-    return (_glptr_CopyPixels) (GET_by_offset(disp, _gloffset_CopyPixels));
-}
-
-static inline void
-SET_CopyPixels(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLint, GLint, GLsizei, GLsizei, GLenum))
-{
-    SET_by_offset(disp, _gloffset_CopyPixels, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ReadPixels) (GLint, GLint, GLsizei, GLsizei,
-                                              GLenum, GLenum, GLvoid *);
-#define CALL_ReadPixels(disp, parameters) \
-    (* GET_ReadPixels(disp)) parameters
-static inline _glptr_ReadPixels
-GET_ReadPixels(struct _glapi_table *disp)
-{
-    return (_glptr_ReadPixels) (GET_by_offset(disp, _gloffset_ReadPixels));
-}
-
-static inline void
-SET_ReadPixels(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLint, GLint, GLsizei, GLsizei, GLenum,
-                                      GLenum, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ReadPixels, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawPixels) (GLsizei, GLsizei, GLenum, GLenum,
-                                              const GLvoid *);
-#define CALL_DrawPixels(disp, parameters) \
-    (* GET_DrawPixels(disp)) parameters
-static inline _glptr_DrawPixels
-GET_DrawPixels(struct _glapi_table *disp)
-{
-    return (_glptr_DrawPixels) (GET_by_offset(disp, _gloffset_DrawPixels));
-}
-
-static inline void
-SET_DrawPixels(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLsizei, GLsizei, GLenum, GLenum,
-                                      const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_DrawPixels, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetBooleanv) (GLenum, GLboolean *);
-
-#define CALL_GetBooleanv(disp, parameters) \
-    (* GET_GetBooleanv(disp)) parameters
-static inline _glptr_GetBooleanv
-GET_GetBooleanv(struct _glapi_table *disp)
-{
-    return (_glptr_GetBooleanv) (GET_by_offset(disp, _gloffset_GetBooleanv));
-}
-
-static inline void
-SET_GetBooleanv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLboolean *))
-{
-    SET_by_offset(disp, _gloffset_GetBooleanv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetClipPlane) (GLenum, GLdouble *);
-
-#define CALL_GetClipPlane(disp, parameters) \
-    (* GET_GetClipPlane(disp)) parameters
-static inline _glptr_GetClipPlane
-GET_GetClipPlane(struct _glapi_table *disp)
-{
-    return (_glptr_GetClipPlane) (GET_by_offset(disp, _gloffset_GetClipPlane));
-}
-
-static inline void
-SET_GetClipPlane(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetClipPlane, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetDoublev) (GLenum, GLdouble *);
-
-#define CALL_GetDoublev(disp, parameters) \
-    (* GET_GetDoublev(disp)) parameters
-static inline _glptr_GetDoublev
-GET_GetDoublev(struct _glapi_table *disp)
-{
-    return (_glptr_GetDoublev) (GET_by_offset(disp, _gloffset_GetDoublev));
-}
-
-static inline void
-SET_GetDoublev(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetDoublev, fn);
-}
-
-typedef GLenum(GLAPIENTRYP _glptr_GetError) (void);
-
-#define CALL_GetError(disp, parameters) \
-    (* GET_GetError(disp)) parameters
-static inline _glptr_GetError
-GET_GetError(struct _glapi_table *disp)
-{
-    return (_glptr_GetError) (GET_by_offset(disp, _gloffset_GetError));
-}
-
-static inline void
-SET_GetError(struct _glapi_table *disp, GLenum(GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_GetError, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetFloatv) (GLenum, GLfloat *);
-
-#define CALL_GetFloatv(disp, parameters) \
-    (* GET_GetFloatv(disp)) parameters
-static inline _glptr_GetFloatv
-GET_GetFloatv(struct _glapi_table *disp)
-{
-    return (_glptr_GetFloatv) (GET_by_offset(disp, _gloffset_GetFloatv));
-}
-
-static inline void
-SET_GetFloatv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetFloatv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetIntegerv) (GLenum, GLint *);
-
-#define CALL_GetIntegerv(disp, parameters) \
-    (* GET_GetIntegerv(disp)) parameters
-static inline _glptr_GetIntegerv
-GET_GetIntegerv(struct _glapi_table *disp)
-{
-    return (_glptr_GetIntegerv) (GET_by_offset(disp, _gloffset_GetIntegerv));
-}
-
-static inline void
-SET_GetIntegerv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetIntegerv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetLightfv) (GLenum, GLenum, GLfloat *);
-
-#define CALL_GetLightfv(disp, parameters) \
-    (* GET_GetLightfv(disp)) parameters
-static inline _glptr_GetLightfv
-GET_GetLightfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetLightfv) (GET_by_offset(disp, _gloffset_GetLightfv));
-}
-
-static inline void
-SET_GetLightfv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetLightfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetLightiv) (GLenum, GLenum, GLint *);
-
-#define CALL_GetLightiv(disp, parameters) \
-    (* GET_GetLightiv(disp)) parameters
-static inline _glptr_GetLightiv
-GET_GetLightiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetLightiv) (GET_by_offset(disp, _gloffset_GetLightiv));
-}
-
-static inline void
-SET_GetLightiv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetLightiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetMapdv) (GLenum, GLenum, GLdouble *);
-
-#define CALL_GetMapdv(disp, parameters) \
-    (* GET_GetMapdv(disp)) parameters
-static inline _glptr_GetMapdv
-GET_GetMapdv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMapdv) (GET_by_offset(disp, _gloffset_GetMapdv));
-}
-
-static inline void
-SET_GetMapdv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetMapdv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetMapfv) (GLenum, GLenum, GLfloat *);
-
-#define CALL_GetMapfv(disp, parameters) \
-    (* GET_GetMapfv(disp)) parameters
-static inline _glptr_GetMapfv
-GET_GetMapfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMapfv) (GET_by_offset(disp, _gloffset_GetMapfv));
-}
-
-static inline void
-SET_GetMapfv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetMapfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetMapiv) (GLenum, GLenum, GLint *);
-
-#define CALL_GetMapiv(disp, parameters) \
-    (* GET_GetMapiv(disp)) parameters
-static inline _glptr_GetMapiv
-GET_GetMapiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMapiv) (GET_by_offset(disp, _gloffset_GetMapiv));
-}
-
-static inline void
-SET_GetMapiv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetMapiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetMaterialfv) (GLenum, GLenum, GLfloat *);
-
-#define CALL_GetMaterialfv(disp, parameters) \
-    (* GET_GetMaterialfv(disp)) parameters
-static inline _glptr_GetMaterialfv
-GET_GetMaterialfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMaterialfv) (GET_by_offset
-                                   (disp, _gloffset_GetMaterialfv));
-}
-
-static inline void
-SET_GetMaterialfv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetMaterialfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetMaterialiv) (GLenum, GLenum, GLint *);
-
-#define CALL_GetMaterialiv(disp, parameters) \
-    (* GET_GetMaterialiv(disp)) parameters
-static inline _glptr_GetMaterialiv
-GET_GetMaterialiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMaterialiv) (GET_by_offset
-                                   (disp, _gloffset_GetMaterialiv));
-}
-
-static inline void
-SET_GetMaterialiv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetMaterialiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetPixelMapfv) (GLenum, GLfloat *);
-
-#define CALL_GetPixelMapfv(disp, parameters) \
-    (* GET_GetPixelMapfv(disp)) parameters
-static inline _glptr_GetPixelMapfv
-GET_GetPixelMapfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetPixelMapfv) (GET_by_offset
-                                   (disp, _gloffset_GetPixelMapfv));
-}
-
-static inline void
-SET_GetPixelMapfv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetPixelMapfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetPixelMapuiv) (GLenum, GLuint *);
-
-#define CALL_GetPixelMapuiv(disp, parameters) \
-    (* GET_GetPixelMapuiv(disp)) parameters
-static inline _glptr_GetPixelMapuiv
-GET_GetPixelMapuiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetPixelMapuiv) (GET_by_offset
-                                    (disp, _gloffset_GetPixelMapuiv));
-}
-
-static inline void
-SET_GetPixelMapuiv(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetPixelMapuiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetPixelMapusv) (GLenum, GLushort *);
-
-#define CALL_GetPixelMapusv(disp, parameters) \
-    (* GET_GetPixelMapusv(disp)) parameters
-static inline _glptr_GetPixelMapusv
-GET_GetPixelMapusv(struct _glapi_table *disp)
-{
-    return (_glptr_GetPixelMapusv) (GET_by_offset
-                                    (disp, _gloffset_GetPixelMapusv));
-}
-
-static inline void
-SET_GetPixelMapusv(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLushort *))
-{
-    SET_by_offset(disp, _gloffset_GetPixelMapusv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetPolygonStipple) (GLubyte *);
-
-#define CALL_GetPolygonStipple(disp, parameters) \
-    (* GET_GetPolygonStipple(disp)) parameters
-static inline _glptr_GetPolygonStipple
-GET_GetPolygonStipple(struct _glapi_table *disp)
-{
-    return (_glptr_GetPolygonStipple) (GET_by_offset
-                                       (disp, _gloffset_GetPolygonStipple));
-}
-
-static inline void
-SET_GetPolygonStipple(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_GetPolygonStipple, fn);
-}
-
-typedef const GLubyte *(GLAPIENTRYP _glptr_GetString) (GLenum);
-
-#define CALL_GetString(disp, parameters) \
-    (* GET_GetString(disp)) parameters
-static inline _glptr_GetString
-GET_GetString(struct _glapi_table *disp)
-{
-    return (_glptr_GetString) (GET_by_offset(disp, _gloffset_GetString));
-}
-
-static inline void
-SET_GetString(struct _glapi_table *disp,
-              const GLubyte * (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_GetString, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexEnvfv) (GLenum, GLenum, GLfloat *);
-
-#define CALL_GetTexEnvfv(disp, parameters) \
-    (* GET_GetTexEnvfv(disp)) parameters
-static inline _glptr_GetTexEnvfv
-GET_GetTexEnvfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexEnvfv) (GET_by_offset(disp, _gloffset_GetTexEnvfv));
-}
-
-static inline void
-SET_GetTexEnvfv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetTexEnvfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexEnviv) (GLenum, GLenum, GLint *);
-
-#define CALL_GetTexEnviv(disp, parameters) \
-    (* GET_GetTexEnviv(disp)) parameters
-static inline _glptr_GetTexEnviv
-GET_GetTexEnviv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexEnviv) (GET_by_offset(disp, _gloffset_GetTexEnviv));
-}
-
-static inline void
-SET_GetTexEnviv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexEnviv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexGendv) (GLenum, GLenum, GLdouble *);
-
-#define CALL_GetTexGendv(disp, parameters) \
-    (* GET_GetTexGendv(disp)) parameters
-static inline _glptr_GetTexGendv
-GET_GetTexGendv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexGendv) (GET_by_offset(disp, _gloffset_GetTexGendv));
-}
-
-static inline void
-SET_GetTexGendv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLenum, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetTexGendv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexGenfv) (GLenum, GLenum, GLfloat *);
-
-#define CALL_GetTexGenfv(disp, parameters) \
-    (* GET_GetTexGenfv(disp)) parameters
-static inline _glptr_GetTexGenfv
-GET_GetTexGenfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexGenfv) (GET_by_offset(disp, _gloffset_GetTexGenfv));
-}
-
-static inline void
-SET_GetTexGenfv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetTexGenfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexGeniv) (GLenum, GLenum, GLint *);
-
-#define CALL_GetTexGeniv(disp, parameters) \
-    (* GET_GetTexGeniv(disp)) parameters
-static inline _glptr_GetTexGeniv
-GET_GetTexGeniv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexGeniv) (GET_by_offset(disp, _gloffset_GetTexGeniv));
-}
-
-static inline void
-SET_GetTexGeniv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexGeniv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexImage) (GLenum, GLint, GLenum, GLenum,
-                                               GLvoid *);
-#define CALL_GetTexImage(disp, parameters) \
-    (* GET_GetTexImage(disp)) parameters
-static inline _glptr_GetTexImage
-GET_GetTexImage(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexImage) (GET_by_offset(disp, _gloffset_GetTexImage));
-}
-
-static inline void
-SET_GetTexImage(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLint, GLenum, GLenum, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetTexImage, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexParameterfv) (GLenum, GLenum, GLfloat *);
-
-#define CALL_GetTexParameterfv(disp, parameters) \
-    (* GET_GetTexParameterfv(disp)) parameters
-static inline _glptr_GetTexParameterfv
-GET_GetTexParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexParameterfv) (GET_by_offset
-                                       (disp, _gloffset_GetTexParameterfv));
-}
-
-static inline void
-SET_GetTexParameterfv(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetTexParameterfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexParameteriv) (GLenum, GLenum, GLint *);
-
-#define CALL_GetTexParameteriv(disp, parameters) \
-    (* GET_GetTexParameteriv(disp)) parameters
-static inline _glptr_GetTexParameteriv
-GET_GetTexParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexParameteriv) (GET_by_offset
-                                       (disp, _gloffset_GetTexParameteriv));
-}
-
-static inline void
-SET_GetTexParameteriv(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexParameteriv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexLevelParameterfv) (GLenum, GLint, GLenum,
-                                                          GLfloat *);
-#define CALL_GetTexLevelParameterfv(disp, parameters) \
-    (* GET_GetTexLevelParameterfv(disp)) parameters
-static inline _glptr_GetTexLevelParameterfv
-GET_GetTexLevelParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexLevelParameterfv) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetTexLevelParameterfv));
-}
-
-static inline void
-SET_GetTexLevelParameterfv(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLint, GLenum,
-                                                  GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetTexLevelParameterfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexLevelParameteriv) (GLenum, GLint, GLenum,
-                                                          GLint *);
-#define CALL_GetTexLevelParameteriv(disp, parameters) \
-    (* GET_GetTexLevelParameteriv(disp)) parameters
-static inline _glptr_GetTexLevelParameteriv
-GET_GetTexLevelParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexLevelParameteriv) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetTexLevelParameteriv));
-}
-
-static inline void
-SET_GetTexLevelParameteriv(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLint, GLenum,
-                                                  GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexLevelParameteriv, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsEnabled) (GLenum);
-
-#define CALL_IsEnabled(disp, parameters) \
-    (* GET_IsEnabled(disp)) parameters
-static inline _glptr_IsEnabled
-GET_IsEnabled(struct _glapi_table *disp)
-{
-    return (_glptr_IsEnabled) (GET_by_offset(disp, _gloffset_IsEnabled));
-}
-
-static inline void
-SET_IsEnabled(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_IsEnabled, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsList) (GLuint);
-
-#define CALL_IsList(disp, parameters) \
-    (* GET_IsList(disp)) parameters
-static inline _glptr_IsList
-GET_IsList(struct _glapi_table *disp)
-{
-    return (_glptr_IsList) (GET_by_offset(disp, _gloffset_IsList));
-}
-
-static inline void
-SET_IsList(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsList, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DepthRange) (GLclampd, GLclampd);
-
-#define CALL_DepthRange(disp, parameters) \
-    (* GET_DepthRange(disp)) parameters
-static inline _glptr_DepthRange
-GET_DepthRange(struct _glapi_table *disp)
-{
-    return (_glptr_DepthRange) (GET_by_offset(disp, _gloffset_DepthRange));
-}
-
-static inline void
-SET_DepthRange(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLclampd, GLclampd))
-{
-    SET_by_offset(disp, _gloffset_DepthRange, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Frustum) (GLdouble, GLdouble, GLdouble,
-                                           GLdouble, GLdouble, GLdouble);
-#define CALL_Frustum(disp, parameters) \
-    (* GET_Frustum(disp)) parameters
-static inline _glptr_Frustum
-GET_Frustum(struct _glapi_table *disp)
-{
-    return (_glptr_Frustum) (GET_by_offset(disp, _gloffset_Frustum));
-}
-
-static inline void
-SET_Frustum(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble,
-                                   GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Frustum, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LoadIdentity) (void);
-
-#define CALL_LoadIdentity(disp, parameters) \
-    (* GET_LoadIdentity(disp)) parameters
-static inline _glptr_LoadIdentity
-GET_LoadIdentity(struct _glapi_table *disp)
-{
-    return (_glptr_LoadIdentity) (GET_by_offset(disp, _gloffset_LoadIdentity));
-}
-
-static inline void
-SET_LoadIdentity(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_LoadIdentity, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LoadMatrixf) (const GLfloat *);
-
-#define CALL_LoadMatrixf(disp, parameters) \
-    (* GET_LoadMatrixf(disp)) parameters
-static inline _glptr_LoadMatrixf
-GET_LoadMatrixf(struct _glapi_table *disp)
-{
-    return (_glptr_LoadMatrixf) (GET_by_offset(disp, _gloffset_LoadMatrixf));
-}
-
-static inline void
-SET_LoadMatrixf(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_LoadMatrixf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LoadMatrixd) (const GLdouble *);
-
-#define CALL_LoadMatrixd(disp, parameters) \
-    (* GET_LoadMatrixd(disp)) parameters
-static inline _glptr_LoadMatrixd
-GET_LoadMatrixd(struct _glapi_table *disp)
-{
-    return (_glptr_LoadMatrixd) (GET_by_offset(disp, _gloffset_LoadMatrixd));
-}
-
-static inline void
-SET_LoadMatrixd(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_LoadMatrixd, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MatrixMode) (GLenum);
-
-#define CALL_MatrixMode(disp, parameters) \
-    (* GET_MatrixMode(disp)) parameters
-static inline _glptr_MatrixMode
-GET_MatrixMode(struct _glapi_table *disp)
-{
-    return (_glptr_MatrixMode) (GET_by_offset(disp, _gloffset_MatrixMode));
-}
-
-static inline void
-SET_MatrixMode(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_MatrixMode, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultMatrixf) (const GLfloat *);
-
-#define CALL_MultMatrixf(disp, parameters) \
-    (* GET_MultMatrixf(disp)) parameters
-static inline _glptr_MultMatrixf
-GET_MultMatrixf(struct _glapi_table *disp)
-{
-    return (_glptr_MultMatrixf) (GET_by_offset(disp, _gloffset_MultMatrixf));
-}
-
-static inline void
-SET_MultMatrixf(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_MultMatrixf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultMatrixd) (const GLdouble *);
-
-#define CALL_MultMatrixd(disp, parameters) \
-    (* GET_MultMatrixd(disp)) parameters
-static inline _glptr_MultMatrixd
-GET_MultMatrixd(struct _glapi_table *disp)
-{
-    return (_glptr_MultMatrixd) (GET_by_offset(disp, _gloffset_MultMatrixd));
-}
-
-static inline void
-SET_MultMatrixd(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_MultMatrixd, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Ortho) (GLdouble, GLdouble, GLdouble, GLdouble,
-                                         GLdouble, GLdouble);
-#define CALL_Ortho(disp, parameters) \
-    (* GET_Ortho(disp)) parameters
-static inline _glptr_Ortho
-GET_Ortho(struct _glapi_table *disp)
-{
-    return (_glptr_Ortho) (GET_by_offset(disp, _gloffset_Ortho));
-}
-
-static inline void
-SET_Ortho(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble,
-                                 GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Ortho, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PopMatrix) (void);
-
-#define CALL_PopMatrix(disp, parameters) \
-    (* GET_PopMatrix(disp)) parameters
-static inline _glptr_PopMatrix
-GET_PopMatrix(struct _glapi_table *disp)
-{
-    return (_glptr_PopMatrix) (GET_by_offset(disp, _gloffset_PopMatrix));
-}
-
-static inline void
-SET_PopMatrix(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PopMatrix, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PushMatrix) (void);
-
-#define CALL_PushMatrix(disp, parameters) \
-    (* GET_PushMatrix(disp)) parameters
-static inline _glptr_PushMatrix
-GET_PushMatrix(struct _glapi_table *disp)
-{
-    return (_glptr_PushMatrix) (GET_by_offset(disp, _gloffset_PushMatrix));
-}
-
-static inline void
-SET_PushMatrix(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PushMatrix, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Rotated) (GLdouble, GLdouble, GLdouble,
-                                           GLdouble);
-#define CALL_Rotated(disp, parameters) \
-    (* GET_Rotated(disp)) parameters
-static inline _glptr_Rotated
-GET_Rotated(struct _glapi_table *disp)
-{
-    return (_glptr_Rotated) (GET_by_offset(disp, _gloffset_Rotated));
-}
-
-static inline void
-SET_Rotated(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Rotated, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Rotatef) (GLfloat, GLfloat, GLfloat, GLfloat);
-
-#define CALL_Rotatef(disp, parameters) \
-    (* GET_Rotatef(disp)) parameters
-static inline _glptr_Rotatef
-GET_Rotatef(struct _glapi_table *disp)
-{
-    return (_glptr_Rotatef) (GET_by_offset(disp, _gloffset_Rotatef));
-}
-
-static inline void
-SET_Rotatef(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Rotatef, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Scaled) (GLdouble, GLdouble, GLdouble);
-
-#define CALL_Scaled(disp, parameters) \
-    (* GET_Scaled(disp)) parameters
-static inline _glptr_Scaled
-GET_Scaled(struct _glapi_table *disp)
-{
-    return (_glptr_Scaled) (GET_by_offset(disp, _gloffset_Scaled));
-}
-
-static inline void
-SET_Scaled(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Scaled, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Scalef) (GLfloat, GLfloat, GLfloat);
-
-#define CALL_Scalef(disp, parameters) \
-    (* GET_Scalef(disp)) parameters
-static inline _glptr_Scalef
-GET_Scalef(struct _glapi_table *disp)
-{
-    return (_glptr_Scalef) (GET_by_offset(disp, _gloffset_Scalef));
-}
-
-static inline void
-SET_Scalef(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Scalef, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Translated) (GLdouble, GLdouble, GLdouble);
-
-#define CALL_Translated(disp, parameters) \
-    (* GET_Translated(disp)) parameters
-static inline _glptr_Translated
-GET_Translated(struct _glapi_table *disp)
-{
-    return (_glptr_Translated) (GET_by_offset(disp, _gloffset_Translated));
-}
-
-static inline void
-SET_Translated(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Translated, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Translatef) (GLfloat, GLfloat, GLfloat);
-
-#define CALL_Translatef(disp, parameters) \
-    (* GET_Translatef(disp)) parameters
-static inline _glptr_Translatef
-GET_Translatef(struct _glapi_table *disp)
-{
-    return (_glptr_Translatef) (GET_by_offset(disp, _gloffset_Translatef));
-}
-
-static inline void
-SET_Translatef(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Translatef, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Viewport) (GLint, GLint, GLsizei, GLsizei);
-
-#define CALL_Viewport(disp, parameters) \
-    (* GET_Viewport(disp)) parameters
-static inline _glptr_Viewport
-GET_Viewport(struct _glapi_table *disp)
-{
-    return (_glptr_Viewport) (GET_by_offset(disp, _gloffset_Viewport));
-}
-
-static inline void
-SET_Viewport(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLint, GLint, GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_Viewport, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ArrayElement) (GLint);
-
-#define CALL_ArrayElement(disp, parameters) \
-    (* GET_ArrayElement(disp)) parameters
-static inline _glptr_ArrayElement
-GET_ArrayElement(struct _glapi_table *disp)
-{
-    return (_glptr_ArrayElement) (GET_by_offset(disp, _gloffset_ArrayElement));
-}
-
-static inline void
-SET_ArrayElement(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint))
-{
-    SET_by_offset(disp, _gloffset_ArrayElement, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindTexture) (GLenum, GLuint);
-
-#define CALL_BindTexture(disp, parameters) \
-    (* GET_BindTexture(disp)) parameters
-static inline _glptr_BindTexture
-GET_BindTexture(struct _glapi_table *disp)
-{
-    return (_glptr_BindTexture) (GET_by_offset(disp, _gloffset_BindTexture));
-}
-
-static inline void
-SET_BindTexture(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindTexture, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorPointer) (GLint, GLenum, GLsizei,
-                                                const GLvoid *);
-#define CALL_ColorPointer(disp, parameters) \
-    (* GET_ColorPointer(disp)) parameters
-static inline _glptr_ColorPointer
-GET_ColorPointer(struct _glapi_table *disp)
-{
-    return (_glptr_ColorPointer) (GET_by_offset(disp, _gloffset_ColorPointer));
-}
-
-static inline void
-SET_ColorPointer(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ColorPointer, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DisableClientState) (GLenum);
-
-#define CALL_DisableClientState(disp, parameters) \
-    (* GET_DisableClientState(disp)) parameters
-static inline _glptr_DisableClientState
-GET_DisableClientState(struct _glapi_table *disp)
-{
-    return (_glptr_DisableClientState) (GET_by_offset
-                                        (disp, _gloffset_DisableClientState));
-}
-
-static inline void
-SET_DisableClientState(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_DisableClientState, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawArrays) (GLenum, GLint, GLsizei);
-
-#define CALL_DrawArrays(disp, parameters) \
-    (* GET_DrawArrays(disp)) parameters
-static inline _glptr_DrawArrays
-GET_DrawArrays(struct _glapi_table *disp)
-{
-    return (_glptr_DrawArrays) (GET_by_offset(disp, _gloffset_DrawArrays));
-}
-
-static inline void
-SET_DrawArrays(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLint, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_DrawArrays, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawElements) (GLenum, GLsizei, GLenum,
-                                                const GLvoid *);
-#define CALL_DrawElements(disp, parameters) \
-    (* GET_DrawElements(disp)) parameters
-static inline _glptr_DrawElements
-GET_DrawElements(struct _glapi_table *disp)
-{
-    return (_glptr_DrawElements) (GET_by_offset(disp, _gloffset_DrawElements));
-}
-
-static inline void
-SET_DrawElements(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum,
-                                        const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_DrawElements, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EdgeFlagPointer) (GLsizei, const GLvoid *);
-
-#define CALL_EdgeFlagPointer(disp, parameters) \
-    (* GET_EdgeFlagPointer(disp)) parameters
-static inline _glptr_EdgeFlagPointer
-GET_EdgeFlagPointer(struct _glapi_table *disp)
-{
-    return (_glptr_EdgeFlagPointer) (GET_by_offset
-                                     (disp, _gloffset_EdgeFlagPointer));
-}
-
-static inline void
-SET_EdgeFlagPointer(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_EdgeFlagPointer, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EnableClientState) (GLenum);
-
-#define CALL_EnableClientState(disp, parameters) \
-    (* GET_EnableClientState(disp)) parameters
-static inline _glptr_EnableClientState
-GET_EnableClientState(struct _glapi_table *disp)
-{
-    return (_glptr_EnableClientState) (GET_by_offset
-                                       (disp, _gloffset_EnableClientState));
-}
-
-static inline void
-SET_EnableClientState(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_EnableClientState, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_IndexPointer) (GLenum, GLsizei,
-                                                const GLvoid *);
-#define CALL_IndexPointer(disp, parameters) \
-    (* GET_IndexPointer(disp)) parameters
-static inline _glptr_IndexPointer
-GET_IndexPointer(struct _glapi_table *disp)
-{
-    return (_glptr_IndexPointer) (GET_by_offset(disp, _gloffset_IndexPointer));
-}
-
-static inline void
-SET_IndexPointer(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_IndexPointer, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Indexub) (GLubyte);
-
-#define CALL_Indexub(disp, parameters) \
-    (* GET_Indexub(disp)) parameters
-static inline _glptr_Indexub
-GET_Indexub(struct _glapi_table *disp)
-{
-    return (_glptr_Indexub) (GET_by_offset(disp, _gloffset_Indexub));
-}
-
-static inline void
-SET_Indexub(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLubyte))
-{
-    SET_by_offset(disp, _gloffset_Indexub, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Indexubv) (const GLubyte *);
-
-#define CALL_Indexubv(disp, parameters) \
-    (* GET_Indexubv(disp)) parameters
-static inline _glptr_Indexubv
-GET_Indexubv(struct _glapi_table *disp)
-{
-    return (_glptr_Indexubv) (GET_by_offset(disp, _gloffset_Indexubv));
-}
-
-static inline void
-SET_Indexubv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_Indexubv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_InterleavedArrays) (GLenum, GLsizei,
-                                                     const GLvoid *);
-#define CALL_InterleavedArrays(disp, parameters) \
-    (* GET_InterleavedArrays(disp)) parameters
-static inline _glptr_InterleavedArrays
-GET_InterleavedArrays(struct _glapi_table *disp)
-{
-    return (_glptr_InterleavedArrays) (GET_by_offset
-                                       (disp, _gloffset_InterleavedArrays));
-}
-
-static inline void
-SET_InterleavedArrays(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_InterleavedArrays, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_NormalPointer) (GLenum, GLsizei,
-                                                 const GLvoid *);
-#define CALL_NormalPointer(disp, parameters) \
-    (* GET_NormalPointer(disp)) parameters
-static inline _glptr_NormalPointer
-GET_NormalPointer(struct _glapi_table *disp)
-{
-    return (_glptr_NormalPointer) (GET_by_offset
-                                   (disp, _gloffset_NormalPointer));
-}
-
-static inline void
-SET_NormalPointer(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_NormalPointer, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PolygonOffset) (GLfloat, GLfloat);
-
-#define CALL_PolygonOffset(disp, parameters) \
-    (* GET_PolygonOffset(disp)) parameters
-static inline _glptr_PolygonOffset
-GET_PolygonOffset(struct _glapi_table *disp)
-{
-    return (_glptr_PolygonOffset) (GET_by_offset
-                                   (disp, _gloffset_PolygonOffset));
-}
-
-static inline void
-SET_PolygonOffset(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PolygonOffset, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoordPointer) (GLint, GLenum, GLsizei,
-                                                   const GLvoid *);
-#define CALL_TexCoordPointer(disp, parameters) \
-    (* GET_TexCoordPointer(disp)) parameters
-static inline _glptr_TexCoordPointer
-GET_TexCoordPointer(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordPointer) (GET_by_offset
-                                     (disp, _gloffset_TexCoordPointer));
-}
-
-static inline void
-SET_TexCoordPointer(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei,
-                                           const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexCoordPointer, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexPointer) (GLint, GLenum, GLsizei,
-                                                 const GLvoid *);
-#define CALL_VertexPointer(disp, parameters) \
-    (* GET_VertexPointer(disp)) parameters
-static inline _glptr_VertexPointer
-GET_VertexPointer(struct _glapi_table *disp)
-{
-    return (_glptr_VertexPointer) (GET_by_offset
-                                   (disp, _gloffset_VertexPointer));
-}
-
-static inline void
-SET_VertexPointer(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei,
-                                         const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_VertexPointer, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_AreTexturesResident) (GLsizei,
-                                                           const GLuint *,
-                                                           GLboolean *);
-#define CALL_AreTexturesResident(disp, parameters) \
-    (* GET_AreTexturesResident(disp)) parameters
-static inline _glptr_AreTexturesResident
-GET_AreTexturesResident(struct _glapi_table *disp)
-{
-    return (_glptr_AreTexturesResident) (GET_by_offset
-                                         (disp, _gloffset_AreTexturesResident));
-}
-
-static inline void
-SET_AreTexturesResident(struct _glapi_table *disp,
-                        GLboolean(GLAPIENTRYP fn) (GLsizei, const GLuint *,
-                                                   GLboolean *))
-{
-    SET_by_offset(disp, _gloffset_AreTexturesResident, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CopyTexImage1D) (GLenum, GLint, GLenum, GLint,
-                                                  GLint, GLsizei, GLint);
-#define CALL_CopyTexImage1D(disp, parameters) \
-    (* GET_CopyTexImage1D(disp)) parameters
-static inline _glptr_CopyTexImage1D
-GET_CopyTexImage1D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyTexImage1D) (GET_by_offset
-                                    (disp, _gloffset_CopyTexImage1D));
-}
-
-static inline void
-SET_CopyTexImage1D(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLint, GLenum, GLint, GLint,
-                                          GLsizei, GLint))
-{
-    SET_by_offset(disp, _gloffset_CopyTexImage1D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CopyTexImage2D) (GLenum, GLint, GLenum, GLint,
-                                                  GLint, GLsizei, GLsizei,
-                                                  GLint);
-#define CALL_CopyTexImage2D(disp, parameters) \
-    (* GET_CopyTexImage2D(disp)) parameters
-static inline _glptr_CopyTexImage2D
-GET_CopyTexImage2D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyTexImage2D) (GET_by_offset
-                                    (disp, _gloffset_CopyTexImage2D));
-}
-
-static inline void
-SET_CopyTexImage2D(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLint, GLenum, GLint, GLint,
-                                          GLsizei, GLsizei, GLint))
-{
-    SET_by_offset(disp, _gloffset_CopyTexImage2D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CopyTexSubImage1D) (GLenum, GLint, GLint,
-                                                     GLint, GLint, GLsizei);
-#define CALL_CopyTexSubImage1D(disp, parameters) \
-    (* GET_CopyTexSubImage1D(disp)) parameters
-static inline _glptr_CopyTexSubImage1D
-GET_CopyTexSubImage1D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyTexSubImage1D) (GET_by_offset
-                                       (disp, _gloffset_CopyTexSubImage1D));
-}
-
-static inline void
-SET_CopyTexSubImage1D(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint, GLint,
-                                             GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyTexSubImage1D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CopyTexSubImage2D) (GLenum, GLint, GLint,
-                                                     GLint, GLint, GLint,
-                                                     GLsizei, GLsizei);
-#define CALL_CopyTexSubImage2D(disp, parameters) \
-    (* GET_CopyTexSubImage2D(disp)) parameters
-static inline _glptr_CopyTexSubImage2D
-GET_CopyTexSubImage2D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyTexSubImage2D) (GET_by_offset
-                                       (disp, _gloffset_CopyTexSubImage2D));
-}
-
-static inline void
-SET_CopyTexSubImage2D(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint, GLint,
-                                             GLint, GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyTexSubImage2D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteTextures) (GLsizei, const GLuint *);
-
-#define CALL_DeleteTextures(disp, parameters) \
-    (* GET_DeleteTextures(disp)) parameters
-static inline _glptr_DeleteTextures
-GET_DeleteTextures(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteTextures) (GET_by_offset
-                                    (disp, _gloffset_DeleteTextures));
-}
-
-static inline void
-SET_DeleteTextures(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteTextures, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenTextures) (GLsizei, GLuint *);
-
-#define CALL_GenTextures(disp, parameters) \
-    (* GET_GenTextures(disp)) parameters
-static inline _glptr_GenTextures
-GET_GenTextures(struct _glapi_table *disp)
-{
-    return (_glptr_GenTextures) (GET_by_offset(disp, _gloffset_GenTextures));
-}
-
-static inline void
-SET_GenTextures(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenTextures, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetPointerv) (GLenum, GLvoid **);
-
-#define CALL_GetPointerv(disp, parameters) \
-    (* GET_GetPointerv(disp)) parameters
-static inline _glptr_GetPointerv
-GET_GetPointerv(struct _glapi_table *disp)
-{
-    return (_glptr_GetPointerv) (GET_by_offset(disp, _gloffset_GetPointerv));
-}
-
-static inline void
-SET_GetPointerv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLvoid **))
-{
-    SET_by_offset(disp, _gloffset_GetPointerv, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsTexture) (GLuint);
-
-#define CALL_IsTexture(disp, parameters) \
-    (* GET_IsTexture(disp)) parameters
-static inline _glptr_IsTexture
-GET_IsTexture(struct _glapi_table *disp)
-{
-    return (_glptr_IsTexture) (GET_by_offset(disp, _gloffset_IsTexture));
-}
-
-static inline void
-SET_IsTexture(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsTexture, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PrioritizeTextures) (GLsizei, const GLuint *,
-                                                      const GLclampf *);
-#define CALL_PrioritizeTextures(disp, parameters) \
-    (* GET_PrioritizeTextures(disp)) parameters
-static inline _glptr_PrioritizeTextures
-GET_PrioritizeTextures(struct _glapi_table *disp)
-{
-    return (_glptr_PrioritizeTextures) (GET_by_offset
-                                        (disp, _gloffset_PrioritizeTextures));
-}
-
-static inline void
-SET_PrioritizeTextures(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLsizei, const GLuint *,
-                                              const GLclampf *))
-{
-    SET_by_offset(disp, _gloffset_PrioritizeTextures, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexSubImage1D) (GLenum, GLint, GLint, GLsizei,
-                                                 GLenum, GLenum,
-                                                 const GLvoid *);
-#define CALL_TexSubImage1D(disp, parameters) \
-    (* GET_TexSubImage1D(disp)) parameters
-static inline _glptr_TexSubImage1D
-GET_TexSubImage1D(struct _glapi_table *disp)
-{
-    return (_glptr_TexSubImage1D) (GET_by_offset
-                                   (disp, _gloffset_TexSubImage1D));
-}
-
-static inline void
-SET_TexSubImage1D(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLsizei, GLenum,
-                                         GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexSubImage1D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexSubImage2D) (GLenum, GLint, GLint, GLint,
-                                                 GLsizei, GLsizei, GLenum,
-                                                 GLenum, const GLvoid *);
-#define CALL_TexSubImage2D(disp, parameters) \
-    (* GET_TexSubImage2D(disp)) parameters
-static inline _glptr_TexSubImage2D
-GET_TexSubImage2D(struct _glapi_table *disp)
-{
-    return (_glptr_TexSubImage2D) (GET_by_offset
-                                   (disp, _gloffset_TexSubImage2D));
-}
-
-static inline void
-SET_TexSubImage2D(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint, GLsizei,
-                                         GLsizei, GLenum, GLenum,
-                                         const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexSubImage2D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PopClientAttrib) (void);
-
-#define CALL_PopClientAttrib(disp, parameters) \
-    (* GET_PopClientAttrib(disp)) parameters
-static inline _glptr_PopClientAttrib
-GET_PopClientAttrib(struct _glapi_table *disp)
-{
-    return (_glptr_PopClientAttrib) (GET_by_offset
-                                     (disp, _gloffset_PopClientAttrib));
-}
-
-static inline void
-SET_PopClientAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PopClientAttrib, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PushClientAttrib) (GLbitfield);
-
-#define CALL_PushClientAttrib(disp, parameters) \
-    (* GET_PushClientAttrib(disp)) parameters
-static inline _glptr_PushClientAttrib
-GET_PushClientAttrib(struct _glapi_table *disp)
-{
-    return (_glptr_PushClientAttrib) (GET_by_offset
-                                      (disp, _gloffset_PushClientAttrib));
-}
-
-static inline void
-SET_PushClientAttrib(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLbitfield))
-{
-    SET_by_offset(disp, _gloffset_PushClientAttrib, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BlendColor) (GLclampf, GLclampf, GLclampf,
-                                              GLclampf);
-#define CALL_BlendColor(disp, parameters) \
-    (* GET_BlendColor(disp)) parameters
-static inline _glptr_BlendColor
-GET_BlendColor(struct _glapi_table *disp)
-{
-    return (_glptr_BlendColor) (GET_by_offset(disp, _gloffset_BlendColor));
-}
-
-static inline void
-SET_BlendColor(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLclampf, GLclampf, GLclampf, GLclampf))
-{
-    SET_by_offset(disp, _gloffset_BlendColor, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BlendEquation) (GLenum);
-
-#define CALL_BlendEquation(disp, parameters) \
-    (* GET_BlendEquation(disp)) parameters
-static inline _glptr_BlendEquation
-GET_BlendEquation(struct _glapi_table *disp)
-{
-    return (_glptr_BlendEquation) (GET_by_offset
-                                   (disp, _gloffset_BlendEquation));
-}
-
-static inline void
-SET_BlendEquation(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendEquation, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawRangeElements) (GLenum, GLuint, GLuint,
-                                                     GLsizei, GLenum,
-                                                     const GLvoid *);
-#define CALL_DrawRangeElements(disp, parameters) \
-    (* GET_DrawRangeElements(disp)) parameters
-static inline _glptr_DrawRangeElements
-GET_DrawRangeElements(struct _glapi_table *disp)
-{
-    return (_glptr_DrawRangeElements) (GET_by_offset
-                                       (disp, _gloffset_DrawRangeElements));
-}
-
-static inline void
-SET_DrawRangeElements(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLsizei,
-                                             GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_DrawRangeElements, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorTable) (GLenum, GLenum, GLsizei, GLenum,
-                                              GLenum, const GLvoid *);
-#define CALL_ColorTable(disp, parameters) \
-    (* GET_ColorTable(disp)) parameters
-static inline _glptr_ColorTable
-GET_ColorTable(struct _glapi_table *disp)
-{
-    return (_glptr_ColorTable) (GET_by_offset(disp, _gloffset_ColorTable));
-}
-
-static inline void
-SET_ColorTable(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLenum, GLenum,
-                                      const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ColorTable, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorTableParameterfv) (GLenum, GLenum,
-                                                         const GLfloat *);
-#define CALL_ColorTableParameterfv(disp, parameters) \
-    (* GET_ColorTableParameterfv(disp)) parameters
-static inline _glptr_ColorTableParameterfv
-GET_ColorTableParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_ColorTableParameterfv) (GET_by_offset
-                                           (disp,
-                                            _gloffset_ColorTableParameterfv));
-}
-
-static inline void
-SET_ColorTableParameterfv(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                 const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ColorTableParameterfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorTableParameteriv) (GLenum, GLenum,
-                                                         const GLint *);
-#define CALL_ColorTableParameteriv(disp, parameters) \
-    (* GET_ColorTableParameteriv(disp)) parameters
-static inline _glptr_ColorTableParameteriv
-GET_ColorTableParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_ColorTableParameteriv) (GET_by_offset
-                                           (disp,
-                                            _gloffset_ColorTableParameteriv));
-}
-
-static inline void
-SET_ColorTableParameteriv(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_ColorTableParameteriv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CopyColorTable) (GLenum, GLenum, GLint, GLint,
-                                                  GLsizei);
-#define CALL_CopyColorTable(disp, parameters) \
-    (* GET_CopyColorTable(disp)) parameters
-static inline _glptr_CopyColorTable
-GET_CopyColorTable(struct _glapi_table *disp)
-{
-    return (_glptr_CopyColorTable) (GET_by_offset
-                                    (disp, _gloffset_CopyColorTable));
-}
-
-static inline void
-SET_CopyColorTable(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLenum, GLint, GLint,
-                                          GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyColorTable, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetColorTable) (GLenum, GLenum, GLenum,
-                                                 GLvoid *);
-#define CALL_GetColorTable(disp, parameters) \
-    (* GET_GetColorTable(disp)) parameters
-static inline _glptr_GetColorTable
-GET_GetColorTable(struct _glapi_table *disp)
-{
-    return (_glptr_GetColorTable) (GET_by_offset
-                                   (disp, _gloffset_GetColorTable));
-}
-
-static inline void
-SET_GetColorTable(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetColorTable, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetColorTableParameterfv) (GLenum, GLenum,
-                                                            GLfloat *);
-#define CALL_GetColorTableParameterfv(disp, parameters) \
-    (* GET_GetColorTableParameterfv(disp)) parameters
-static inline _glptr_GetColorTableParameterfv
-GET_GetColorTableParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetColorTableParameterfv) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetColorTableParameterfv));
-}
-
-static inline void
-SET_GetColorTableParameterfv(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetColorTableParameterfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetColorTableParameteriv) (GLenum, GLenum,
-                                                            GLint *);
-#define CALL_GetColorTableParameteriv(disp, parameters) \
-    (* GET_GetColorTableParameteriv(disp)) parameters
-static inline _glptr_GetColorTableParameteriv
-GET_GetColorTableParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetColorTableParameteriv) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetColorTableParameteriv));
-}
-
-static inline void
-SET_GetColorTableParameteriv(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetColorTableParameteriv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorSubTable) (GLenum, GLsizei, GLsizei,
-                                                 GLenum, GLenum,
-                                                 const GLvoid *);
-#define CALL_ColorSubTable(disp, parameters) \
-    (* GET_ColorSubTable(disp)) parameters
-static inline _glptr_ColorSubTable
-GET_ColorSubTable(struct _glapi_table *disp)
-{
-    return (_glptr_ColorSubTable) (GET_by_offset
-                                   (disp, _gloffset_ColorSubTable));
-}
-
-static inline void
-SET_ColorSubTable(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLsizei, GLsizei, GLenum,
-                                         GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ColorSubTable, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CopyColorSubTable) (GLenum, GLsizei, GLint,
-                                                     GLint, GLsizei);
-#define CALL_CopyColorSubTable(disp, parameters) \
-    (* GET_CopyColorSubTable(disp)) parameters
-static inline _glptr_CopyColorSubTable
-GET_CopyColorSubTable(struct _glapi_table *disp)
-{
-    return (_glptr_CopyColorSubTable) (GET_by_offset
-                                       (disp, _gloffset_CopyColorSubTable));
-}
-
-static inline void
-SET_CopyColorSubTable(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLsizei, GLint, GLint,
-                                             GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyColorSubTable, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ConvolutionFilter1D) (GLenum, GLenum, GLsizei,
-                                                       GLenum, GLenum,
-                                                       const GLvoid *);
-#define CALL_ConvolutionFilter1D(disp, parameters) \
-    (* GET_ConvolutionFilter1D(disp)) parameters
-static inline _glptr_ConvolutionFilter1D
-GET_ConvolutionFilter1D(struct _glapi_table *disp)
-{
-    return (_glptr_ConvolutionFilter1D) (GET_by_offset
-                                         (disp, _gloffset_ConvolutionFilter1D));
-}
-
-static inline void
-SET_ConvolutionFilter1D(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLenum,
-                                               GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ConvolutionFilter1D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ConvolutionFilter2D) (GLenum, GLenum, GLsizei,
-                                                       GLsizei, GLenum, GLenum,
-                                                       const GLvoid *);
-#define CALL_ConvolutionFilter2D(disp, parameters) \
-    (* GET_ConvolutionFilter2D(disp)) parameters
-static inline _glptr_ConvolutionFilter2D
-GET_ConvolutionFilter2D(struct _glapi_table *disp)
-{
-    return (_glptr_ConvolutionFilter2D) (GET_by_offset
-                                         (disp, _gloffset_ConvolutionFilter2D));
-}
-
-static inline void
-SET_ConvolutionFilter2D(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLsizei,
-                                               GLenum, GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ConvolutionFilter2D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ConvolutionParameterf) (GLenum, GLenum,
-                                                         GLfloat);
-#define CALL_ConvolutionParameterf(disp, parameters) \
-    (* GET_ConvolutionParameterf(disp)) parameters
-static inline _glptr_ConvolutionParameterf
-GET_ConvolutionParameterf(struct _glapi_table *disp)
-{
-    return (_glptr_ConvolutionParameterf) (GET_by_offset
-                                           (disp,
-                                            _gloffset_ConvolutionParameterf));
-}
-
-static inline void
-SET_ConvolutionParameterf(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_ConvolutionParameterf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ConvolutionParameterfv) (GLenum, GLenum,
-                                                          const GLfloat *);
-#define CALL_ConvolutionParameterfv(disp, parameters) \
-    (* GET_ConvolutionParameterfv(disp)) parameters
-static inline _glptr_ConvolutionParameterfv
-GET_ConvolutionParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_ConvolutionParameterfv) (GET_by_offset
-                                            (disp,
-                                             _gloffset_ConvolutionParameterfv));
-}
-
-static inline void
-SET_ConvolutionParameterfv(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                  const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ConvolutionParameterfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ConvolutionParameteri) (GLenum, GLenum, GLint);
-
-#define CALL_ConvolutionParameteri(disp, parameters) \
-    (* GET_ConvolutionParameteri(disp)) parameters
-static inline _glptr_ConvolutionParameteri
-GET_ConvolutionParameteri(struct _glapi_table *disp)
-{
-    return (_glptr_ConvolutionParameteri) (GET_by_offset
-                                           (disp,
-                                            _gloffset_ConvolutionParameteri));
-}
-
-static inline void
-SET_ConvolutionParameteri(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_ConvolutionParameteri, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ConvolutionParameteriv) (GLenum, GLenum,
-                                                          const GLint *);
-#define CALL_ConvolutionParameteriv(disp, parameters) \
-    (* GET_ConvolutionParameteriv(disp)) parameters
-static inline _glptr_ConvolutionParameteriv
-GET_ConvolutionParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_ConvolutionParameteriv) (GET_by_offset
-                                            (disp,
-                                             _gloffset_ConvolutionParameteriv));
-}
-
-static inline void
-SET_ConvolutionParameteriv(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                  const GLint *))
-{
-    SET_by_offset(disp, _gloffset_ConvolutionParameteriv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CopyConvolutionFilter1D) (GLenum, GLenum,
-                                                           GLint, GLint,
-                                                           GLsizei);
-#define CALL_CopyConvolutionFilter1D(disp, parameters) \
-    (* GET_CopyConvolutionFilter1D(disp)) parameters
-static inline _glptr_CopyConvolutionFilter1D
-GET_CopyConvolutionFilter1D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyConvolutionFilter1D) (GET_by_offset
-                                             (disp,
-                                              _gloffset_CopyConvolutionFilter1D));
-}
-
-static inline void
-SET_CopyConvolutionFilter1D(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLint, GLint,
-                                                   GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyConvolutionFilter1D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CopyConvolutionFilter2D) (GLenum, GLenum,
-                                                           GLint, GLint,
-                                                           GLsizei, GLsizei);
-#define CALL_CopyConvolutionFilter2D(disp, parameters) \
-    (* GET_CopyConvolutionFilter2D(disp)) parameters
-static inline _glptr_CopyConvolutionFilter2D
-GET_CopyConvolutionFilter2D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyConvolutionFilter2D) (GET_by_offset
-                                             (disp,
-                                              _gloffset_CopyConvolutionFilter2D));
-}
-
-static inline void
-SET_CopyConvolutionFilter2D(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLint, GLint,
-                                                   GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyConvolutionFilter2D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetConvolutionFilter) (GLenum, GLenum, GLenum,
-                                                        GLvoid *);
-#define CALL_GetConvolutionFilter(disp, parameters) \
-    (* GET_GetConvolutionFilter(disp)) parameters
-static inline _glptr_GetConvolutionFilter
-GET_GetConvolutionFilter(struct _glapi_table *disp)
-{
-    return (_glptr_GetConvolutionFilter) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetConvolutionFilter));
-}
-
-static inline void
-SET_GetConvolutionFilter(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetConvolutionFilter, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetConvolutionParameterfv) (GLenum, GLenum,
-                                                             GLfloat *);
-#define CALL_GetConvolutionParameterfv(disp, parameters) \
-    (* GET_GetConvolutionParameterfv(disp)) parameters
-static inline _glptr_GetConvolutionParameterfv
-GET_GetConvolutionParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetConvolutionParameterfv) (GET_by_offset
-                                               (disp,
-                                                _gloffset_GetConvolutionParameterfv));
-}
-
-static inline void
-SET_GetConvolutionParameterfv(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetConvolutionParameterfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetConvolutionParameteriv) (GLenum, GLenum,
-                                                             GLint *);
-#define CALL_GetConvolutionParameteriv(disp, parameters) \
-    (* GET_GetConvolutionParameteriv(disp)) parameters
-static inline _glptr_GetConvolutionParameteriv
-GET_GetConvolutionParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetConvolutionParameteriv) (GET_by_offset
-                                               (disp,
-                                                _gloffset_GetConvolutionParameteriv));
-}
-
-static inline void
-SET_GetConvolutionParameteriv(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetConvolutionParameteriv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetSeparableFilter) (GLenum, GLenum, GLenum,
-                                                      GLvoid *, GLvoid *,
-                                                      GLvoid *);
-#define CALL_GetSeparableFilter(disp, parameters) \
-    (* GET_GetSeparableFilter(disp)) parameters
-static inline _glptr_GetSeparableFilter
-GET_GetSeparableFilter(struct _glapi_table *disp)
-{
-    return (_glptr_GetSeparableFilter) (GET_by_offset
-                                        (disp, _gloffset_GetSeparableFilter));
-}
-
-static inline void
-SET_GetSeparableFilter(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLvoid *,
-                                              GLvoid *, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetSeparableFilter, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SeparableFilter2D) (GLenum, GLenum, GLsizei,
-                                                     GLsizei, GLenum, GLenum,
-                                                     const GLvoid *,
-                                                     const GLvoid *);
-#define CALL_SeparableFilter2D(disp, parameters) \
-    (* GET_SeparableFilter2D(disp)) parameters
-static inline _glptr_SeparableFilter2D
-GET_SeparableFilter2D(struct _glapi_table *disp)
-{
-    return (_glptr_SeparableFilter2D) (GET_by_offset
-                                       (disp, _gloffset_SeparableFilter2D));
-}
-
-static inline void
-SET_SeparableFilter2D(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLsizei,
-                                             GLenum, GLenum, const GLvoid *,
-                                             const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_SeparableFilter2D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetHistogram) (GLenum, GLboolean, GLenum,
-                                                GLenum, GLvoid *);
-#define CALL_GetHistogram(disp, parameters) \
-    (* GET_GetHistogram(disp)) parameters
-static inline _glptr_GetHistogram
-GET_GetHistogram(struct _glapi_table *disp)
-{
-    return (_glptr_GetHistogram) (GET_by_offset(disp, _gloffset_GetHistogram));
-}
-
-static inline void
-SET_GetHistogram(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLboolean, GLenum, GLenum,
-                                        GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetHistogram, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetHistogramParameterfv) (GLenum, GLenum,
-                                                           GLfloat *);
-#define CALL_GetHistogramParameterfv(disp, parameters) \
-    (* GET_GetHistogramParameterfv(disp)) parameters
-static inline _glptr_GetHistogramParameterfv
-GET_GetHistogramParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetHistogramParameterfv) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetHistogramParameterfv));
-}
-
-static inline void
-SET_GetHistogramParameterfv(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetHistogramParameterfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetHistogramParameteriv) (GLenum, GLenum,
-                                                           GLint *);
-#define CALL_GetHistogramParameteriv(disp, parameters) \
-    (* GET_GetHistogramParameteriv(disp)) parameters
-static inline _glptr_GetHistogramParameteriv
-GET_GetHistogramParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetHistogramParameteriv) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetHistogramParameteriv));
-}
-
-static inline void
-SET_GetHistogramParameteriv(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetHistogramParameteriv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetMinmax) (GLenum, GLboolean, GLenum, GLenum,
-                                             GLvoid *);
-#define CALL_GetMinmax(disp, parameters) \
-    (* GET_GetMinmax(disp)) parameters
-static inline _glptr_GetMinmax
-GET_GetMinmax(struct _glapi_table *disp)
-{
-    return (_glptr_GetMinmax) (GET_by_offset(disp, _gloffset_GetMinmax));
-}
-
-static inline void
-SET_GetMinmax(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLboolean, GLenum, GLenum,
-                                     GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetMinmax, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetMinmaxParameterfv) (GLenum, GLenum,
-                                                        GLfloat *);
-#define CALL_GetMinmaxParameterfv(disp, parameters) \
-    (* GET_GetMinmaxParameterfv(disp)) parameters
-static inline _glptr_GetMinmaxParameterfv
-GET_GetMinmaxParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMinmaxParameterfv) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetMinmaxParameterfv));
-}
-
-static inline void
-SET_GetMinmaxParameterfv(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetMinmaxParameterfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetMinmaxParameteriv) (GLenum, GLenum,
-                                                        GLint *);
-#define CALL_GetMinmaxParameteriv(disp, parameters) \
-    (* GET_GetMinmaxParameteriv(disp)) parameters
-static inline _glptr_GetMinmaxParameteriv
-GET_GetMinmaxParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMinmaxParameteriv) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetMinmaxParameteriv));
-}
-
-static inline void
-SET_GetMinmaxParameteriv(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetMinmaxParameteriv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Histogram) (GLenum, GLsizei, GLenum,
-                                             GLboolean);
-#define CALL_Histogram(disp, parameters) \
-    (* GET_Histogram(disp)) parameters
-static inline _glptr_Histogram
-GET_Histogram(struct _glapi_table *disp)
-{
-    return (_glptr_Histogram) (GET_by_offset(disp, _gloffset_Histogram));
-}
-
-static inline void
-SET_Histogram(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum, GLboolean))
-{
-    SET_by_offset(disp, _gloffset_Histogram, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Minmax) (GLenum, GLenum, GLboolean);
-
-#define CALL_Minmax(disp, parameters) \
-    (* GET_Minmax(disp)) parameters
-static inline _glptr_Minmax
-GET_Minmax(struct _glapi_table *disp)
-{
-    return (_glptr_Minmax) (GET_by_offset(disp, _gloffset_Minmax));
-}
-
-static inline void
-SET_Minmax(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (GLenum, GLenum, GLboolean))
-{
-    SET_by_offset(disp, _gloffset_Minmax, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ResetHistogram) (GLenum);
-
-#define CALL_ResetHistogram(disp, parameters) \
-    (* GET_ResetHistogram(disp)) parameters
-static inline _glptr_ResetHistogram
-GET_ResetHistogram(struct _glapi_table *disp)
-{
-    return (_glptr_ResetHistogram) (GET_by_offset
-                                    (disp, _gloffset_ResetHistogram));
-}
-
-static inline void
-SET_ResetHistogram(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ResetHistogram, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ResetMinmax) (GLenum);
-
-#define CALL_ResetMinmax(disp, parameters) \
-    (* GET_ResetMinmax(disp)) parameters
-static inline _glptr_ResetMinmax
-GET_ResetMinmax(struct _glapi_table *disp)
-{
-    return (_glptr_ResetMinmax) (GET_by_offset(disp, _gloffset_ResetMinmax));
-}
-
-static inline void
-SET_ResetMinmax(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ResetMinmax, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexImage3D) (GLenum, GLint, GLint, GLsizei,
-                                              GLsizei, GLsizei, GLint, GLenum,
-                                              GLenum, const GLvoid *);
-#define CALL_TexImage3D(disp, parameters) \
-    (* GET_TexImage3D(disp)) parameters
-static inline _glptr_TexImage3D
-GET_TexImage3D(struct _glapi_table *disp)
-{
-    return (_glptr_TexImage3D) (GET_by_offset(disp, _gloffset_TexImage3D));
-}
-
-static inline void
-SET_TexImage3D(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLsizei, GLsizei,
-                                      GLsizei, GLint, GLenum, GLenum,
-                                      const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexImage3D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexSubImage3D) (GLenum, GLint, GLint, GLint,
-                                                 GLint, GLsizei, GLsizei,
-                                                 GLsizei, GLenum, GLenum,
-                                                 const GLvoid *);
-#define CALL_TexSubImage3D(disp, parameters) \
-    (* GET_TexSubImage3D(disp)) parameters
-static inline _glptr_TexSubImage3D
-GET_TexSubImage3D(struct _glapi_table *disp)
-{
-    return (_glptr_TexSubImage3D) (GET_by_offset
-                                   (disp, _gloffset_TexSubImage3D));
-}
-
-static inline void
-SET_TexSubImage3D(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint, GLint,
-                                         GLsizei, GLsizei, GLsizei, GLenum,
-                                         GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexSubImage3D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CopyTexSubImage3D) (GLenum, GLint, GLint,
-                                                     GLint, GLint, GLint, GLint,
-                                                     GLsizei, GLsizei);
-#define CALL_CopyTexSubImage3D(disp, parameters) \
-    (* GET_CopyTexSubImage3D(disp)) parameters
-static inline _glptr_CopyTexSubImage3D
-GET_CopyTexSubImage3D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyTexSubImage3D) (GET_by_offset
-                                       (disp, _gloffset_CopyTexSubImage3D));
-}
-
-static inline void
-SET_CopyTexSubImage3D(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint, GLint,
-                                             GLint, GLint, GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyTexSubImage3D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ActiveTextureARB) (GLenum);
-
-#define CALL_ActiveTextureARB(disp, parameters) \
-    (* GET_ActiveTextureARB(disp)) parameters
-static inline _glptr_ActiveTextureARB
-GET_ActiveTextureARB(struct _glapi_table *disp)
-{
-    return (_glptr_ActiveTextureARB) (GET_by_offset
-                                      (disp, _gloffset_ActiveTextureARB));
-}
-
-static inline void
-SET_ActiveTextureARB(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ActiveTextureARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClientActiveTextureARB) (GLenum);
-
-#define CALL_ClientActiveTextureARB(disp, parameters) \
-    (* GET_ClientActiveTextureARB(disp)) parameters
-static inline _glptr_ClientActiveTextureARB
-GET_ClientActiveTextureARB(struct _glapi_table *disp)
-{
-    return (_glptr_ClientActiveTextureARB) (GET_by_offset
-                                            (disp,
-                                             _gloffset_ClientActiveTextureARB));
-}
-
-static inline void
-SET_ClientActiveTextureARB(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ClientActiveTextureARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1dARB) (GLenum, GLdouble);
-
-#define CALL_MultiTexCoord1dARB(disp, parameters) \
-    (* GET_MultiTexCoord1dARB(disp)) parameters
-static inline _glptr_MultiTexCoord1dARB
-GET_MultiTexCoord1dARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1dARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord1dARB));
-}
-
-static inline void
-SET_MultiTexCoord1dARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1dARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1dvARB) (GLenum,
-                                                       const GLdouble *);
-#define CALL_MultiTexCoord1dvARB(disp, parameters) \
-    (* GET_MultiTexCoord1dvARB(disp)) parameters
-static inline _glptr_MultiTexCoord1dvARB
-GET_MultiTexCoord1dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1dvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord1dvARB));
-}
-
-static inline void
-SET_MultiTexCoord1dvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1dvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1fARB) (GLenum, GLfloat);
-
-#define CALL_MultiTexCoord1fARB(disp, parameters) \
-    (* GET_MultiTexCoord1fARB(disp)) parameters
-static inline _glptr_MultiTexCoord1fARB
-GET_MultiTexCoord1fARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1fARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord1fARB));
-}
-
-static inline void
-SET_MultiTexCoord1fARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1fvARB) (GLenum, const GLfloat *);
-
-#define CALL_MultiTexCoord1fvARB(disp, parameters) \
-    (* GET_MultiTexCoord1fvARB(disp)) parameters
-static inline _glptr_MultiTexCoord1fvARB
-GET_MultiTexCoord1fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1fvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord1fvARB));
-}
-
-static inline void
-SET_MultiTexCoord1fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1iARB) (GLenum, GLint);
-
-#define CALL_MultiTexCoord1iARB(disp, parameters) \
-    (* GET_MultiTexCoord1iARB(disp)) parameters
-static inline _glptr_MultiTexCoord1iARB
-GET_MultiTexCoord1iARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1iARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord1iARB));
-}
-
-static inline void
-SET_MultiTexCoord1iARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1iARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1ivARB) (GLenum, const GLint *);
-
-#define CALL_MultiTexCoord1ivARB(disp, parameters) \
-    (* GET_MultiTexCoord1ivARB(disp)) parameters
-static inline _glptr_MultiTexCoord1ivARB
-GET_MultiTexCoord1ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1ivARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord1ivARB));
-}
-
-static inline void
-SET_MultiTexCoord1ivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1ivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1sARB) (GLenum, GLshort);
-
-#define CALL_MultiTexCoord1sARB(disp, parameters) \
-    (* GET_MultiTexCoord1sARB(disp)) parameters
-static inline _glptr_MultiTexCoord1sARB
-GET_MultiTexCoord1sARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1sARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord1sARB));
-}
-
-static inline void
-SET_MultiTexCoord1sARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLshort))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1sARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1svARB) (GLenum, const GLshort *);
-
-#define CALL_MultiTexCoord1svARB(disp, parameters) \
-    (* GET_MultiTexCoord1svARB(disp)) parameters
-static inline _glptr_MultiTexCoord1svARB
-GET_MultiTexCoord1svARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1svARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord1svARB));
-}
-
-static inline void
-SET_MultiTexCoord1svARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1svARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2dARB) (GLenum, GLdouble,
-                                                      GLdouble);
-#define CALL_MultiTexCoord2dARB(disp, parameters) \
-    (* GET_MultiTexCoord2dARB(disp)) parameters
-static inline _glptr_MultiTexCoord2dARB
-GET_MultiTexCoord2dARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2dARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord2dARB));
-}
-
-static inline void
-SET_MultiTexCoord2dARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2dARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2dvARB) (GLenum,
-                                                       const GLdouble *);
-#define CALL_MultiTexCoord2dvARB(disp, parameters) \
-    (* GET_MultiTexCoord2dvARB(disp)) parameters
-static inline _glptr_MultiTexCoord2dvARB
-GET_MultiTexCoord2dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2dvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord2dvARB));
-}
-
-static inline void
-SET_MultiTexCoord2dvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2dvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2fARB) (GLenum, GLfloat, GLfloat);
-
-#define CALL_MultiTexCoord2fARB(disp, parameters) \
-    (* GET_MultiTexCoord2fARB(disp)) parameters
-static inline _glptr_MultiTexCoord2fARB
-GET_MultiTexCoord2fARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2fARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord2fARB));
-}
-
-static inline void
-SET_MultiTexCoord2fARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2fvARB) (GLenum, const GLfloat *);
-
-#define CALL_MultiTexCoord2fvARB(disp, parameters) \
-    (* GET_MultiTexCoord2fvARB(disp)) parameters
-static inline _glptr_MultiTexCoord2fvARB
-GET_MultiTexCoord2fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2fvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord2fvARB));
-}
-
-static inline void
-SET_MultiTexCoord2fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2iARB) (GLenum, GLint, GLint);
-
-#define CALL_MultiTexCoord2iARB(disp, parameters) \
-    (* GET_MultiTexCoord2iARB(disp)) parameters
-static inline _glptr_MultiTexCoord2iARB
-GET_MultiTexCoord2iARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2iARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord2iARB));
-}
-
-static inline void
-SET_MultiTexCoord2iARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2iARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2ivARB) (GLenum, const GLint *);
-
-#define CALL_MultiTexCoord2ivARB(disp, parameters) \
-    (* GET_MultiTexCoord2ivARB(disp)) parameters
-static inline _glptr_MultiTexCoord2ivARB
-GET_MultiTexCoord2ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2ivARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord2ivARB));
-}
-
-static inline void
-SET_MultiTexCoord2ivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2ivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2sARB) (GLenum, GLshort, GLshort);
-
-#define CALL_MultiTexCoord2sARB(disp, parameters) \
-    (* GET_MultiTexCoord2sARB(disp)) parameters
-static inline _glptr_MultiTexCoord2sARB
-GET_MultiTexCoord2sARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2sARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord2sARB));
-}
-
-static inline void
-SET_MultiTexCoord2sARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2sARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2svARB) (GLenum, const GLshort *);
-
-#define CALL_MultiTexCoord2svARB(disp, parameters) \
-    (* GET_MultiTexCoord2svARB(disp)) parameters
-static inline _glptr_MultiTexCoord2svARB
-GET_MultiTexCoord2svARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2svARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord2svARB));
-}
-
-static inline void
-SET_MultiTexCoord2svARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2svARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3dARB) (GLenum, GLdouble,
-                                                      GLdouble, GLdouble);
-#define CALL_MultiTexCoord3dARB(disp, parameters) \
-    (* GET_MultiTexCoord3dARB(disp)) parameters
-static inline _glptr_MultiTexCoord3dARB
-GET_MultiTexCoord3dARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3dARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord3dARB));
-}
-
-static inline void
-SET_MultiTexCoord3dARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLdouble, GLdouble,
-                                              GLdouble))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3dARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3dvARB) (GLenum,
-                                                       const GLdouble *);
-#define CALL_MultiTexCoord3dvARB(disp, parameters) \
-    (* GET_MultiTexCoord3dvARB(disp)) parameters
-static inline _glptr_MultiTexCoord3dvARB
-GET_MultiTexCoord3dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3dvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord3dvARB));
-}
-
-static inline void
-SET_MultiTexCoord3dvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3dvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3fARB) (GLenum, GLfloat, GLfloat,
-                                                      GLfloat);
-#define CALL_MultiTexCoord3fARB(disp, parameters) \
-    (* GET_MultiTexCoord3fARB(disp)) parameters
-static inline _glptr_MultiTexCoord3fARB
-GET_MultiTexCoord3fARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3fARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord3fARB));
-}
-
-static inline void
-SET_MultiTexCoord3fARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLfloat, GLfloat,
-                                              GLfloat))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3fvARB) (GLenum, const GLfloat *);
-
-#define CALL_MultiTexCoord3fvARB(disp, parameters) \
-    (* GET_MultiTexCoord3fvARB(disp)) parameters
-static inline _glptr_MultiTexCoord3fvARB
-GET_MultiTexCoord3fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3fvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord3fvARB));
-}
-
-static inline void
-SET_MultiTexCoord3fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3iARB) (GLenum, GLint, GLint,
-                                                      GLint);
-#define CALL_MultiTexCoord3iARB(disp, parameters) \
-    (* GET_MultiTexCoord3iARB(disp)) parameters
-static inline _glptr_MultiTexCoord3iARB
-GET_MultiTexCoord3iARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3iARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord3iARB));
-}
-
-static inline void
-SET_MultiTexCoord3iARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3iARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3ivARB) (GLenum, const GLint *);
-
-#define CALL_MultiTexCoord3ivARB(disp, parameters) \
-    (* GET_MultiTexCoord3ivARB(disp)) parameters
-static inline _glptr_MultiTexCoord3ivARB
-GET_MultiTexCoord3ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3ivARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord3ivARB));
-}
-
-static inline void
-SET_MultiTexCoord3ivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3ivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3sARB) (GLenum, GLshort, GLshort,
-                                                      GLshort);
-#define CALL_MultiTexCoord3sARB(disp, parameters) \
-    (* GET_MultiTexCoord3sARB(disp)) parameters
-static inline _glptr_MultiTexCoord3sARB
-GET_MultiTexCoord3sARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3sARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord3sARB));
-}
-
-static inline void
-SET_MultiTexCoord3sARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLshort, GLshort,
-                                              GLshort))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3sARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3svARB) (GLenum, const GLshort *);
-
-#define CALL_MultiTexCoord3svARB(disp, parameters) \
-    (* GET_MultiTexCoord3svARB(disp)) parameters
-static inline _glptr_MultiTexCoord3svARB
-GET_MultiTexCoord3svARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3svARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord3svARB));
-}
-
-static inline void
-SET_MultiTexCoord3svARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3svARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4dARB) (GLenum, GLdouble,
-                                                      GLdouble, GLdouble,
-                                                      GLdouble);
-#define CALL_MultiTexCoord4dARB(disp, parameters) \
-    (* GET_MultiTexCoord4dARB(disp)) parameters
-static inline _glptr_MultiTexCoord4dARB
-GET_MultiTexCoord4dARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4dARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord4dARB));
-}
-
-static inline void
-SET_MultiTexCoord4dARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLdouble, GLdouble,
-                                              GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4dARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4dvARB) (GLenum,
-                                                       const GLdouble *);
-#define CALL_MultiTexCoord4dvARB(disp, parameters) \
-    (* GET_MultiTexCoord4dvARB(disp)) parameters
-static inline _glptr_MultiTexCoord4dvARB
-GET_MultiTexCoord4dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4dvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord4dvARB));
-}
-
-static inline void
-SET_MultiTexCoord4dvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4dvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4fARB) (GLenum, GLfloat, GLfloat,
-                                                      GLfloat, GLfloat);
-#define CALL_MultiTexCoord4fARB(disp, parameters) \
-    (* GET_MultiTexCoord4fARB(disp)) parameters
-static inline _glptr_MultiTexCoord4fARB
-GET_MultiTexCoord4fARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4fARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord4fARB));
-}
-
-static inline void
-SET_MultiTexCoord4fARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLfloat, GLfloat, GLfloat,
-                                              GLfloat))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4fvARB) (GLenum, const GLfloat *);
-
-#define CALL_MultiTexCoord4fvARB(disp, parameters) \
-    (* GET_MultiTexCoord4fvARB(disp)) parameters
-static inline _glptr_MultiTexCoord4fvARB
-GET_MultiTexCoord4fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4fvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord4fvARB));
-}
-
-static inline void
-SET_MultiTexCoord4fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4iARB) (GLenum, GLint, GLint,
-                                                      GLint, GLint);
-#define CALL_MultiTexCoord4iARB(disp, parameters) \
-    (* GET_MultiTexCoord4iARB(disp)) parameters
-static inline _glptr_MultiTexCoord4iARB
-GET_MultiTexCoord4iARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4iARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord4iARB));
-}
-
-static inline void
-SET_MultiTexCoord4iARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint,
-                                              GLint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4iARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4ivARB) (GLenum, const GLint *);
-
-#define CALL_MultiTexCoord4ivARB(disp, parameters) \
-    (* GET_MultiTexCoord4ivARB(disp)) parameters
-static inline _glptr_MultiTexCoord4ivARB
-GET_MultiTexCoord4ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4ivARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord4ivARB));
-}
-
-static inline void
-SET_MultiTexCoord4ivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4ivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4sARB) (GLenum, GLshort, GLshort,
-                                                      GLshort, GLshort);
-#define CALL_MultiTexCoord4sARB(disp, parameters) \
-    (* GET_MultiTexCoord4sARB(disp)) parameters
-static inline _glptr_MultiTexCoord4sARB
-GET_MultiTexCoord4sARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4sARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord4sARB));
-}
-
-static inline void
-SET_MultiTexCoord4sARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLshort, GLshort, GLshort,
-                                              GLshort))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4sARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4svARB) (GLenum, const GLshort *);
-
-#define CALL_MultiTexCoord4svARB(disp, parameters) \
-    (* GET_MultiTexCoord4svARB(disp)) parameters
-static inline _glptr_MultiTexCoord4svARB
-GET_MultiTexCoord4svARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4svARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord4svARB));
-}
-
-static inline void
-SET_MultiTexCoord4svARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4svARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_AttachShader) (GLuint, GLuint);
-
-#define CALL_AttachShader(disp, parameters) \
-    (* GET_AttachShader(disp)) parameters
-static inline _glptr_AttachShader
-GET_AttachShader(struct _glapi_table *disp)
-{
-    return (_glptr_AttachShader) (GET_by_offset(disp, _gloffset_AttachShader));
-}
-
-static inline void
-SET_AttachShader(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_AttachShader, fn);
-}
-
-typedef GLuint(GLAPIENTRYP _glptr_CreateProgram) (void);
-
-#define CALL_CreateProgram(disp, parameters) \
-    (* GET_CreateProgram(disp)) parameters
-static inline _glptr_CreateProgram
-GET_CreateProgram(struct _glapi_table *disp)
-{
-    return (_glptr_CreateProgram) (GET_by_offset
-                                   (disp, _gloffset_CreateProgram));
-}
-
-static inline void
-SET_CreateProgram(struct _glapi_table *disp, GLuint(GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_CreateProgram, fn);
-}
-
-typedef GLuint(GLAPIENTRYP _glptr_CreateShader) (GLenum);
-
-#define CALL_CreateShader(disp, parameters) \
-    (* GET_CreateShader(disp)) parameters
-static inline _glptr_CreateShader
-GET_CreateShader(struct _glapi_table *disp)
-{
-    return (_glptr_CreateShader) (GET_by_offset(disp, _gloffset_CreateShader));
-}
-
-static inline void
-SET_CreateShader(struct _glapi_table *disp, GLuint(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_CreateShader, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteProgram) (GLuint);
-
-#define CALL_DeleteProgram(disp, parameters) \
-    (* GET_DeleteProgram(disp)) parameters
-static inline _glptr_DeleteProgram
-GET_DeleteProgram(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteProgram) (GET_by_offset
-                                   (disp, _gloffset_DeleteProgram));
-}
-
-static inline void
-SET_DeleteProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_DeleteProgram, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteShader) (GLuint);
-
-#define CALL_DeleteShader(disp, parameters) \
-    (* GET_DeleteShader(disp)) parameters
-static inline _glptr_DeleteShader
-GET_DeleteShader(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteShader) (GET_by_offset(disp, _gloffset_DeleteShader));
-}
-
-static inline void
-SET_DeleteShader(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_DeleteShader, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DetachShader) (GLuint, GLuint);
-
-#define CALL_DetachShader(disp, parameters) \
-    (* GET_DetachShader(disp)) parameters
-static inline _glptr_DetachShader
-GET_DetachShader(struct _glapi_table *disp)
-{
-    return (_glptr_DetachShader) (GET_by_offset(disp, _gloffset_DetachShader));
-}
-
-static inline void
-SET_DetachShader(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_DetachShader, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetAttachedShaders) (GLuint, GLsizei,
-                                                      GLsizei *, GLuint *);
-#define CALL_GetAttachedShaders(disp, parameters) \
-    (* GET_GetAttachedShaders(disp)) parameters
-static inline _glptr_GetAttachedShaders
-GET_GetAttachedShaders(struct _glapi_table *disp)
-{
-    return (_glptr_GetAttachedShaders) (GET_by_offset
-                                        (disp, _gloffset_GetAttachedShaders));
-}
-
-static inline void
-SET_GetAttachedShaders(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, GLsizei *,
-                                              GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetAttachedShaders, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramInfoLog) (GLuint, GLsizei, GLsizei *,
-                                                     GLchar *);
-#define CALL_GetProgramInfoLog(disp, parameters) \
-    (* GET_GetProgramInfoLog(disp)) parameters
-static inline _glptr_GetProgramInfoLog
-GET_GetProgramInfoLog(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramInfoLog) (GET_by_offset
-                                       (disp, _gloffset_GetProgramInfoLog));
-}
-
-static inline void
-SET_GetProgramInfoLog(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLsizei, GLsizei *,
-                                             GLchar *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramInfoLog, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramiv) (GLuint, GLenum, GLint *);
-
-#define CALL_GetProgramiv(disp, parameters) \
-    (* GET_GetProgramiv(disp)) parameters
-static inline _glptr_GetProgramiv
-GET_GetProgramiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramiv) (GET_by_offset(disp, _gloffset_GetProgramiv));
-}
-
-static inline void
-SET_GetProgramiv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetShaderInfoLog) (GLuint, GLsizei, GLsizei *,
-                                                    GLchar *);
-#define CALL_GetShaderInfoLog(disp, parameters) \
-    (* GET_GetShaderInfoLog(disp)) parameters
-static inline _glptr_GetShaderInfoLog
-GET_GetShaderInfoLog(struct _glapi_table *disp)
-{
-    return (_glptr_GetShaderInfoLog) (GET_by_offset
-                                      (disp, _gloffset_GetShaderInfoLog));
-}
-
-static inline void
-SET_GetShaderInfoLog(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLsizei, GLsizei *,
-                                            GLchar *))
-{
-    SET_by_offset(disp, _gloffset_GetShaderInfoLog, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetShaderiv) (GLuint, GLenum, GLint *);
-
-#define CALL_GetShaderiv(disp, parameters) \
-    (* GET_GetShaderiv(disp)) parameters
-static inline _glptr_GetShaderiv
-GET_GetShaderiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetShaderiv) (GET_by_offset(disp, _gloffset_GetShaderiv));
-}
-
-static inline void
-SET_GetShaderiv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetShaderiv, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsProgram) (GLuint);
-
-#define CALL_IsProgram(disp, parameters) \
-    (* GET_IsProgram(disp)) parameters
-static inline _glptr_IsProgram
-GET_IsProgram(struct _glapi_table *disp)
-{
-    return (_glptr_IsProgram) (GET_by_offset(disp, _gloffset_IsProgram));
-}
-
-static inline void
-SET_IsProgram(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsProgram, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsShader) (GLuint);
-
-#define CALL_IsShader(disp, parameters) \
-    (* GET_IsShader(disp)) parameters
-static inline _glptr_IsShader
-GET_IsShader(struct _glapi_table *disp)
-{
-    return (_glptr_IsShader) (GET_by_offset(disp, _gloffset_IsShader));
-}
-
-static inline void
-SET_IsShader(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsShader, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_StencilFuncSeparate) (GLenum, GLenum, GLint,
-                                                       GLuint);
-#define CALL_StencilFuncSeparate(disp, parameters) \
-    (* GET_StencilFuncSeparate(disp)) parameters
-static inline _glptr_StencilFuncSeparate
-GET_StencilFuncSeparate(struct _glapi_table *disp)
-{
-    return (_glptr_StencilFuncSeparate) (GET_by_offset
-                                         (disp, _gloffset_StencilFuncSeparate));
-}
-
-static inline void
-SET_StencilFuncSeparate(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLenum, GLint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_StencilFuncSeparate, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_StencilMaskSeparate) (GLenum, GLuint);
-
-#define CALL_StencilMaskSeparate(disp, parameters) \
-    (* GET_StencilMaskSeparate(disp)) parameters
-static inline _glptr_StencilMaskSeparate
-GET_StencilMaskSeparate(struct _glapi_table *disp)
-{
-    return (_glptr_StencilMaskSeparate) (GET_by_offset
-                                         (disp, _gloffset_StencilMaskSeparate));
-}
-
-static inline void
-SET_StencilMaskSeparate(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_StencilMaskSeparate, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_StencilOpSeparate) (GLenum, GLenum, GLenum,
-                                                     GLenum);
-#define CALL_StencilOpSeparate(disp, parameters) \
-    (* GET_StencilOpSeparate(disp)) parameters
-static inline _glptr_StencilOpSeparate
-GET_StencilOpSeparate(struct _glapi_table *disp)
-{
-    return (_glptr_StencilOpSeparate) (GET_by_offset
-                                       (disp, _gloffset_StencilOpSeparate));
-}
-
-static inline void
-SET_StencilOpSeparate(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_StencilOpSeparate, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UniformMatrix2x3fv) (GLint, GLsizei, GLboolean,
-                                                      const GLfloat *);
-#define CALL_UniformMatrix2x3fv(disp, parameters) \
-    (* GET_UniformMatrix2x3fv(disp)) parameters
-static inline _glptr_UniformMatrix2x3fv
-GET_UniformMatrix2x3fv(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix2x3fv) (GET_by_offset
-                                        (disp, _gloffset_UniformMatrix2x3fv));
-}
-
-static inline void
-SET_UniformMatrix2x3fv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                              const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix2x3fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UniformMatrix2x4fv) (GLint, GLsizei, GLboolean,
-                                                      const GLfloat *);
-#define CALL_UniformMatrix2x4fv(disp, parameters) \
-    (* GET_UniformMatrix2x4fv(disp)) parameters
-static inline _glptr_UniformMatrix2x4fv
-GET_UniformMatrix2x4fv(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix2x4fv) (GET_by_offset
-                                        (disp, _gloffset_UniformMatrix2x4fv));
-}
-
-static inline void
-SET_UniformMatrix2x4fv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                              const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix2x4fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UniformMatrix3x2fv) (GLint, GLsizei, GLboolean,
-                                                      const GLfloat *);
-#define CALL_UniformMatrix3x2fv(disp, parameters) \
-    (* GET_UniformMatrix3x2fv(disp)) parameters
-static inline _glptr_UniformMatrix3x2fv
-GET_UniformMatrix3x2fv(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix3x2fv) (GET_by_offset
-                                        (disp, _gloffset_UniformMatrix3x2fv));
-}
-
-static inline void
-SET_UniformMatrix3x2fv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                              const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix3x2fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UniformMatrix3x4fv) (GLint, GLsizei, GLboolean,
-                                                      const GLfloat *);
-#define CALL_UniformMatrix3x4fv(disp, parameters) \
-    (* GET_UniformMatrix3x4fv(disp)) parameters
-static inline _glptr_UniformMatrix3x4fv
-GET_UniformMatrix3x4fv(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix3x4fv) (GET_by_offset
-                                        (disp, _gloffset_UniformMatrix3x4fv));
-}
-
-static inline void
-SET_UniformMatrix3x4fv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                              const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix3x4fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UniformMatrix4x2fv) (GLint, GLsizei, GLboolean,
-                                                      const GLfloat *);
-#define CALL_UniformMatrix4x2fv(disp, parameters) \
-    (* GET_UniformMatrix4x2fv(disp)) parameters
-static inline _glptr_UniformMatrix4x2fv
-GET_UniformMatrix4x2fv(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix4x2fv) (GET_by_offset
-                                        (disp, _gloffset_UniformMatrix4x2fv));
-}
-
-static inline void
-SET_UniformMatrix4x2fv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                              const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix4x2fv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UniformMatrix4x3fv) (GLint, GLsizei, GLboolean,
-                                                      const GLfloat *);
-#define CALL_UniformMatrix4x3fv(disp, parameters) \
-    (* GET_UniformMatrix4x3fv(disp)) parameters
-static inline _glptr_UniformMatrix4x3fv
-GET_UniformMatrix4x3fv(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix4x3fv) (GET_by_offset
-                                        (disp, _gloffset_UniformMatrix4x3fv));
-}
-
-static inline void
-SET_UniformMatrix4x3fv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                              const GLfloat *))
-{
-    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
-static inline _glptr_ClearBufferfi
-GET_ClearBufferfi(struct _glapi_table *disp)
-{
-    return (_glptr_ClearBufferfi) (GET_by_offset
-                                   (disp, _gloffset_ClearBufferfi));
-}
-
-static inline void
-SET_ClearBufferfi(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint, GLfloat, GLint))
-{
-    SET_by_offset(disp, _gloffset_ClearBufferfi, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClearBufferfv) (GLenum, GLint,
-                                                 const GLfloat *);
-#define CALL_ClearBufferfv(disp, parameters) \
-    (* GET_ClearBufferfv(disp)) parameters
-static inline _glptr_ClearBufferfv
-GET_ClearBufferfv(struct _glapi_table *disp)
-{
-    return (_glptr_ClearBufferfv) (GET_by_offset
-                                   (disp, _gloffset_ClearBufferfv));
-}
-
-static inline void
-SET_ClearBufferfv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ClearBufferfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClearBufferiv) (GLenum, GLint, const GLint *);
-
-#define CALL_ClearBufferiv(disp, parameters) \
-    (* GET_ClearBufferiv(disp)) parameters
-static inline _glptr_ClearBufferiv
-GET_ClearBufferiv(struct _glapi_table *disp)
-{
-    return (_glptr_ClearBufferiv) (GET_by_offset
-                                   (disp, _gloffset_ClearBufferiv));
-}
-
-static inline void
-SET_ClearBufferiv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_ClearBufferiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClearBufferuiv) (GLenum, GLint,
-                                                  const GLuint *);
-#define CALL_ClearBufferuiv(disp, parameters) \
-    (* GET_ClearBufferuiv(disp)) parameters
-static inline _glptr_ClearBufferuiv
-GET_ClearBufferuiv(struct _glapi_table *disp)
-{
-    return (_glptr_ClearBufferuiv) (GET_by_offset
-                                    (disp, _gloffset_ClearBufferuiv));
-}
-
-static inline void
-SET_ClearBufferuiv(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLint, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_ClearBufferuiv, fn);
-}
-
-typedef const GLubyte *(GLAPIENTRYP _glptr_GetStringi) (GLenum, GLuint);
-
-#define CALL_GetStringi(disp, parameters) \
-    (* GET_GetStringi(disp)) parameters
-static inline _glptr_GetStringi
-GET_GetStringi(struct _glapi_table *disp)
-{
-    return (_glptr_GetStringi) (GET_by_offset(disp, _gloffset_GetStringi));
-}
-
-static inline void
-SET_GetStringi(struct _glapi_table *disp,
-               const GLubyte * (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_GetStringi, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexBuffer) (GLenum, GLenum, GLuint);
-
-#define CALL_TexBuffer(disp, parameters) \
-    (* GET_TexBuffer(disp)) parameters
-static inline _glptr_TexBuffer
-GET_TexBuffer(struct _glapi_table *disp)
-{
-    return (_glptr_TexBuffer) (GET_by_offset(disp, _gloffset_TexBuffer));
-}
-
-static inline void
-SET_TexBuffer(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_TexBuffer, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferTexture) (GLenum, GLenum, GLuint,
-                                                      GLint);
-#define CALL_FramebufferTexture(disp, parameters) \
-    (* GET_FramebufferTexture(disp)) parameters
-static inline _glptr_FramebufferTexture
-GET_FramebufferTexture(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTexture) (GET_by_offset
-                                        (disp, _gloffset_FramebufferTexture));
-}
-
-static inline void
-SET_FramebufferTexture(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint, GLint))
-{
-    SET_by_offset(disp, _gloffset_FramebufferTexture, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetBufferParameteri64v) (GLenum, GLenum,
-                                                          GLint64 *);
-#define CALL_GetBufferParameteri64v(disp, parameters) \
-    (* GET_GetBufferParameteri64v(disp)) parameters
-static inline _glptr_GetBufferParameteri64v
-GET_GetBufferParameteri64v(struct _glapi_table *disp)
-{
-    return (_glptr_GetBufferParameteri64v) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetBufferParameteri64v));
-}
-
-static inline void
-SET_GetBufferParameteri64v(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLenum, GLint64 *))
-{
-    SET_by_offset(disp, _gloffset_GetBufferParameteri64v, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetInteger64i_v) (GLenum, GLuint, GLint64 *);
-
-#define CALL_GetInteger64i_v(disp, parameters) \
-    (* GET_GetInteger64i_v(disp)) parameters
-static inline _glptr_GetInteger64i_v
-GET_GetInteger64i_v(struct _glapi_table *disp)
-{
-    return (_glptr_GetInteger64i_v) (GET_by_offset
-                                     (disp, _gloffset_GetInteger64i_v));
-}
-
-static inline void
-SET_GetInteger64i_v(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLenum, GLuint, GLint64 *))
-{
-    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
-static inline _glptr_LoadTransposeMatrixdARB
-GET_LoadTransposeMatrixdARB(struct _glapi_table *disp)
-{
-    return (_glptr_LoadTransposeMatrixdARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_LoadTransposeMatrixdARB));
-}
-
-static inline void
-SET_LoadTransposeMatrixdARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_LoadTransposeMatrixdARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LoadTransposeMatrixfARB) (const GLfloat *);
-
-#define CALL_LoadTransposeMatrixfARB(disp, parameters) \
-    (* GET_LoadTransposeMatrixfARB(disp)) parameters
-static inline _glptr_LoadTransposeMatrixfARB
-GET_LoadTransposeMatrixfARB(struct _glapi_table *disp)
-{
-    return (_glptr_LoadTransposeMatrixfARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_LoadTransposeMatrixfARB));
-}
-
-static inline void
-SET_LoadTransposeMatrixfARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_LoadTransposeMatrixfARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultTransposeMatrixdARB) (const GLdouble *);
-
-#define CALL_MultTransposeMatrixdARB(disp, parameters) \
-    (* GET_MultTransposeMatrixdARB(disp)) parameters
-static inline _glptr_MultTransposeMatrixdARB
-GET_MultTransposeMatrixdARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultTransposeMatrixdARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_MultTransposeMatrixdARB));
-}
-
-static inline void
-SET_MultTransposeMatrixdARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_MultTransposeMatrixdARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultTransposeMatrixfARB) (const GLfloat *);
-
-#define CALL_MultTransposeMatrixfARB(disp, parameters) \
-    (* GET_MultTransposeMatrixfARB(disp)) parameters
-static inline _glptr_MultTransposeMatrixfARB
-GET_MultTransposeMatrixfARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultTransposeMatrixfARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_MultTransposeMatrixfARB));
-}
-
-static inline void
-SET_MultTransposeMatrixfARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_MultTransposeMatrixfARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SampleCoverageARB) (GLclampf, GLboolean);
-
-#define CALL_SampleCoverageARB(disp, parameters) \
-    (* GET_SampleCoverageARB(disp)) parameters
-static inline _glptr_SampleCoverageARB
-GET_SampleCoverageARB(struct _glapi_table *disp)
-{
-    return (_glptr_SampleCoverageARB) (GET_by_offset
-                                       (disp, _gloffset_SampleCoverageARB));
-}
-
-static inline void
-SET_SampleCoverageARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLclampf, GLboolean))
-{
-    SET_by_offset(disp, _gloffset_SampleCoverageARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompressedTexImage1DARB) (GLenum, GLint,
-                                                           GLenum, GLsizei,
-                                                           GLint, GLsizei,
-                                                           const GLvoid *);
-#define CALL_CompressedTexImage1DARB(disp, parameters) \
-    (* GET_CompressedTexImage1DARB(disp)) parameters
-static inline _glptr_CompressedTexImage1DARB
-GET_CompressedTexImage1DARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompressedTexImage1DARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_CompressedTexImage1DARB));
-}
-
-static inline void
-SET_CompressedTexImage1DARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLint, GLenum,
-                                                   GLsizei, GLint, GLsizei,
-                                                   const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CompressedTexImage1DARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompressedTexImage2DARB) (GLenum, GLint,
-                                                           GLenum, GLsizei,
-                                                           GLsizei, GLint,
-                                                           GLsizei,
-                                                           const GLvoid *);
-#define CALL_CompressedTexImage2DARB(disp, parameters) \
-    (* GET_CompressedTexImage2DARB(disp)) parameters
-static inline _glptr_CompressedTexImage2DARB
-GET_CompressedTexImage2DARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompressedTexImage2DARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_CompressedTexImage2DARB));
-}
-
-static inline void
-SET_CompressedTexImage2DARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLint, GLenum,
-                                                   GLsizei, GLsizei, GLint,
-                                                   GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CompressedTexImage2DARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompressedTexImage3DARB) (GLenum, GLint,
-                                                           GLenum, GLsizei,
-                                                           GLsizei, GLsizei,
-                                                           GLint, GLsizei,
-                                                           const GLvoid *);
-#define CALL_CompressedTexImage3DARB(disp, parameters) \
-    (* GET_CompressedTexImage3DARB(disp)) parameters
-static inline _glptr_CompressedTexImage3DARB
-GET_CompressedTexImage3DARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompressedTexImage3DARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_CompressedTexImage3DARB));
-}
-
-static inline void
-SET_CompressedTexImage3DARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLint, GLenum,
-                                                   GLsizei, GLsizei, GLsizei,
-                                                   GLint, GLsizei,
-                                                   const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CompressedTexImage3DARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage1DARB) (GLenum, GLint,
-                                                              GLint, GLsizei,
-                                                              GLenum, GLsizei,
-                                                              const GLvoid *);
-#define CALL_CompressedTexSubImage1DARB(disp, parameters) \
-    (* GET_CompressedTexSubImage1DARB(disp)) parameters
-static inline _glptr_CompressedTexSubImage1DARB
-GET_CompressedTexSubImage1DARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompressedTexSubImage1DARB) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_CompressedTexSubImage1DARB));
-}
-
-static inline void
-SET_CompressedTexSubImage1DARB(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLint, GLint,
-                                                      GLsizei, GLenum, GLsizei,
-                                                      const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CompressedTexSubImage1DARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage2DARB) (GLenum, GLint,
-                                                              GLint, GLint,
-                                                              GLsizei, GLsizei,
-                                                              GLenum, GLsizei,
-                                                              const GLvoid *);
-#define CALL_CompressedTexSubImage2DARB(disp, parameters) \
-    (* GET_CompressedTexSubImage2DARB(disp)) parameters
-static inline _glptr_CompressedTexSubImage2DARB
-GET_CompressedTexSubImage2DARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompressedTexSubImage2DARB) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_CompressedTexSubImage2DARB));
-}
-
-static inline void
-SET_CompressedTexSubImage2DARB(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLint, GLint,
-                                                      GLint, GLsizei, GLsizei,
-                                                      GLenum, GLsizei,
-                                                      const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CompressedTexSubImage2DARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage3DARB) (GLenum, GLint,
-                                                              GLint, GLint,
-                                                              GLint, GLsizei,
-                                                              GLsizei, GLsizei,
-                                                              GLenum, GLsizei,
-                                                              const GLvoid *);
-#define CALL_CompressedTexSubImage3DARB(disp, parameters) \
-    (* GET_CompressedTexSubImage3DARB(disp)) parameters
-static inline _glptr_CompressedTexSubImage3DARB
-GET_CompressedTexSubImage3DARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompressedTexSubImage3DARB) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_CompressedTexSubImage3DARB));
-}
-
-static inline void
-SET_CompressedTexSubImage3DARB(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLint, GLint,
-                                                      GLint, GLint, GLsizei,
-                                                      GLsizei, GLsizei, GLenum,
-                                                      GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CompressedTexSubImage3DARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetCompressedTexImageARB) (GLenum, GLint,
-                                                            GLvoid *);
-#define CALL_GetCompressedTexImageARB(disp, parameters) \
-    (* GET_GetCompressedTexImageARB(disp)) parameters
-static inline _glptr_GetCompressedTexImageARB
-GET_GetCompressedTexImageARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetCompressedTexImageARB) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetCompressedTexImageARB));
-}
-
-static inline void
-SET_GetCompressedTexImageARB(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLint, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetCompressedTexImageARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DisableVertexAttribArrayARB) (GLuint);
-
-#define CALL_DisableVertexAttribArrayARB(disp, parameters) \
-    (* GET_DisableVertexAttribArrayARB(disp)) parameters
-static inline _glptr_DisableVertexAttribArrayARB
-GET_DisableVertexAttribArrayARB(struct _glapi_table *disp)
-{
-    return (_glptr_DisableVertexAttribArrayARB) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_DisableVertexAttribArrayARB));
-}
-
-static inline void
-SET_DisableVertexAttribArrayARB(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_DisableVertexAttribArrayARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EnableVertexAttribArrayARB) (GLuint);
-
-#define CALL_EnableVertexAttribArrayARB(disp, parameters) \
-    (* GET_EnableVertexAttribArrayARB(disp)) parameters
-static inline _glptr_EnableVertexAttribArrayARB
-GET_EnableVertexAttribArrayARB(struct _glapi_table *disp)
-{
-    return (_glptr_EnableVertexAttribArrayARB) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_EnableVertexAttribArrayARB));
-}
-
-static inline void
-SET_EnableVertexAttribArrayARB(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_EnableVertexAttribArrayARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramEnvParameterdvARB) (GLenum, GLuint,
-                                                               GLdouble *);
-#define CALL_GetProgramEnvParameterdvARB(disp, parameters) \
-    (* GET_GetProgramEnvParameterdvARB(disp)) parameters
-static inline _glptr_GetProgramEnvParameterdvARB
-GET_GetProgramEnvParameterdvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramEnvParameterdvARB) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_GetProgramEnvParameterdvARB));
-}
-
-static inline void
-SET_GetProgramEnvParameterdvARB(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLenum, GLuint,
-                                                       GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramEnvParameterdvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramEnvParameterfvARB) (GLenum, GLuint,
-                                                               GLfloat *);
-#define CALL_GetProgramEnvParameterfvARB(disp, parameters) \
-    (* GET_GetProgramEnvParameterfvARB(disp)) parameters
-static inline _glptr_GetProgramEnvParameterfvARB
-GET_GetProgramEnvParameterfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramEnvParameterfvARB) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_GetProgramEnvParameterfvARB));
-}
-
-static inline void
-SET_GetProgramEnvParameterfvARB(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLenum, GLuint,
-                                                       GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramEnvParameterfvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramLocalParameterdvARB) (GLenum, GLuint,
-                                                                 GLdouble *);
-#define CALL_GetProgramLocalParameterdvARB(disp, parameters) \
-    (* GET_GetProgramLocalParameterdvARB(disp)) parameters
-static inline _glptr_GetProgramLocalParameterdvARB
-GET_GetProgramLocalParameterdvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramLocalParameterdvARB) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetProgramLocalParameterdvARB));
-}
-
-static inline void
-SET_GetProgramLocalParameterdvARB(struct _glapi_table *disp,
-                                  void (GLAPIENTRYP fn) (GLenum, GLuint,
-                                                         GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramLocalParameterdvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramLocalParameterfvARB) (GLenum, GLuint,
-                                                                 GLfloat *);
-#define CALL_GetProgramLocalParameterfvARB(disp, parameters) \
-    (* GET_GetProgramLocalParameterfvARB(disp)) parameters
-static inline _glptr_GetProgramLocalParameterfvARB
-GET_GetProgramLocalParameterfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramLocalParameterfvARB) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetProgramLocalParameterfvARB));
-}
-
-static inline void
-SET_GetProgramLocalParameterfvARB(struct _glapi_table *disp,
-                                  void (GLAPIENTRYP fn) (GLenum, GLuint,
-                                                         GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramLocalParameterfvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramStringARB) (GLenum, GLenum,
-                                                       GLvoid *);
-#define CALL_GetProgramStringARB(disp, parameters) \
-    (* GET_GetProgramStringARB(disp)) parameters
-static inline _glptr_GetProgramStringARB
-GET_GetProgramStringARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramStringARB) (GET_by_offset
-                                         (disp, _gloffset_GetProgramStringARB));
-}
-
-static inline void
-SET_GetProgramStringARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLenum, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramStringARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramivARB) (GLenum, GLenum, GLint *);
-
-#define CALL_GetProgramivARB(disp, parameters) \
-    (* GET_GetProgramivARB(disp)) parameters
-static inline _glptr_GetProgramivARB
-GET_GetProgramivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramivARB) (GET_by_offset
-                                     (disp, _gloffset_GetProgramivARB));
-}
-
-static inline void
-SET_GetProgramivARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribdvARB) (GLuint, GLenum,
-                                                        GLdouble *);
-#define CALL_GetVertexAttribdvARB(disp, parameters) \
-    (* GET_GetVertexAttribdvARB(disp)) parameters
-static inline _glptr_GetVertexAttribdvARB
-GET_GetVertexAttribdvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribdvARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetVertexAttribdvARB));
-}
-
-static inline void
-SET_GetVertexAttribdvARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, GLenum, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribdvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribfvARB) (GLuint, GLenum,
-                                                        GLfloat *);
-#define CALL_GetVertexAttribfvARB(disp, parameters) \
-    (* GET_GetVertexAttribfvARB(disp)) parameters
-static inline _glptr_GetVertexAttribfvARB
-GET_GetVertexAttribfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribfvARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetVertexAttribfvARB));
-}
-
-static inline void
-SET_GetVertexAttribfvARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribfvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribivARB) (GLuint, GLenum,
-                                                        GLint *);
-#define CALL_GetVertexAttribivARB(disp, parameters) \
-    (* GET_GetVertexAttribivARB(disp)) parameters
-static inline _glptr_GetVertexAttribivARB
-GET_GetVertexAttribivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribivARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetVertexAttribivARB));
-}
-
-static inline void
-SET_GetVertexAttribivARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4dARB) (GLenum, GLuint,
-                                                            GLdouble, GLdouble,
-                                                            GLdouble, GLdouble);
-#define CALL_ProgramEnvParameter4dARB(disp, parameters) \
-    (* GET_ProgramEnvParameter4dARB(disp)) parameters
-static inline _glptr_ProgramEnvParameter4dARB
-GET_ProgramEnvParameter4dARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramEnvParameter4dARB) (GET_by_offset
-                                              (disp,
-                                               _gloffset_ProgramEnvParameter4dARB));
-}
-
-static inline void
-SET_ProgramEnvParameter4dARB(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLuint, GLdouble,
-                                                    GLdouble, GLdouble,
-                                                    GLdouble))
-{
-    SET_by_offset(disp, _gloffset_ProgramEnvParameter4dARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4dvARB) (GLenum, GLuint,
-                                                             const GLdouble *);
-#define CALL_ProgramEnvParameter4dvARB(disp, parameters) \
-    (* GET_ProgramEnvParameter4dvARB(disp)) parameters
-static inline _glptr_ProgramEnvParameter4dvARB
-GET_ProgramEnvParameter4dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramEnvParameter4dvARB) (GET_by_offset
-                                               (disp,
-                                                _gloffset_ProgramEnvParameter4dvARB));
-}
-
-static inline void
-SET_ProgramEnvParameter4dvARB(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLuint,
-                                                     const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_ProgramEnvParameter4dvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4fARB) (GLenum, GLuint,
-                                                            GLfloat, GLfloat,
-                                                            GLfloat, GLfloat);
-#define CALL_ProgramEnvParameter4fARB(disp, parameters) \
-    (* GET_ProgramEnvParameter4fARB(disp)) parameters
-static inline _glptr_ProgramEnvParameter4fARB
-GET_ProgramEnvParameter4fARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramEnvParameter4fARB) (GET_by_offset
-                                              (disp,
-                                               _gloffset_ProgramEnvParameter4fARB));
-}
-
-static inline void
-SET_ProgramEnvParameter4fARB(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLuint, GLfloat,
-                                                    GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_ProgramEnvParameter4fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4fvARB) (GLenum, GLuint,
-                                                             const GLfloat *);
-#define CALL_ProgramEnvParameter4fvARB(disp, parameters) \
-    (* GET_ProgramEnvParameter4fvARB(disp)) parameters
-static inline _glptr_ProgramEnvParameter4fvARB
-GET_ProgramEnvParameter4fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramEnvParameter4fvARB) (GET_by_offset
-                                               (disp,
-                                                _gloffset_ProgramEnvParameter4fvARB));
-}
-
-static inline void
-SET_ProgramEnvParameter4fvARB(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLuint,
-                                                     const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ProgramEnvParameter4fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4dARB) (GLenum, GLuint,
-                                                              GLdouble,
-                                                              GLdouble,
-                                                              GLdouble,
-                                                              GLdouble);
-#define CALL_ProgramLocalParameter4dARB(disp, parameters) \
-    (* GET_ProgramLocalParameter4dARB(disp)) parameters
-static inline _glptr_ProgramLocalParameter4dARB
-GET_ProgramLocalParameter4dARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramLocalParameter4dARB) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_ProgramLocalParameter4dARB));
-}
-
-static inline void
-SET_ProgramLocalParameter4dARB(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLuint, GLdouble,
-                                                      GLdouble, GLdouble,
-                                                      GLdouble))
-{
-    SET_by_offset(disp, _gloffset_ProgramLocalParameter4dARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4dvARB) (GLenum, GLuint,
-                                                               const GLdouble
-                                                               *);
-#define CALL_ProgramLocalParameter4dvARB(disp, parameters) \
-    (* GET_ProgramLocalParameter4dvARB(disp)) parameters
-static inline _glptr_ProgramLocalParameter4dvARB
-GET_ProgramLocalParameter4dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramLocalParameter4dvARB) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_ProgramLocalParameter4dvARB));
-}
-
-static inline void
-SET_ProgramLocalParameter4dvARB(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLenum, GLuint,
-                                                       const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_ProgramLocalParameter4dvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4fARB) (GLenum, GLuint,
-                                                              GLfloat, GLfloat,
-                                                              GLfloat, GLfloat);
-#define CALL_ProgramLocalParameter4fARB(disp, parameters) \
-    (* GET_ProgramLocalParameter4fARB(disp)) parameters
-static inline _glptr_ProgramLocalParameter4fARB
-GET_ProgramLocalParameter4fARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramLocalParameter4fARB) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_ProgramLocalParameter4fARB));
-}
-
-static inline void
-SET_ProgramLocalParameter4fARB(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLuint, GLfloat,
-                                                      GLfloat, GLfloat,
-                                                      GLfloat))
-{
-    SET_by_offset(disp, _gloffset_ProgramLocalParameter4fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4fvARB) (GLenum, GLuint,
-                                                               const GLfloat *);
-#define CALL_ProgramLocalParameter4fvARB(disp, parameters) \
-    (* GET_ProgramLocalParameter4fvARB(disp)) parameters
-static inline _glptr_ProgramLocalParameter4fvARB
-GET_ProgramLocalParameter4fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramLocalParameter4fvARB) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_ProgramLocalParameter4fvARB));
-}
-
-static inline void
-SET_ProgramLocalParameter4fvARB(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLenum, GLuint,
-                                                       const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ProgramLocalParameter4fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramStringARB) (GLenum, GLenum, GLsizei,
-                                                    const GLvoid *);
-#define CALL_ProgramStringARB(disp, parameters) \
-    (* GET_ProgramStringARB(disp)) parameters
-static inline _glptr_ProgramStringARB
-GET_ProgramStringARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramStringARB) (GET_by_offset
-                                      (disp, _gloffset_ProgramStringARB));
-}
-
-static inline void
-SET_ProgramStringARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei,
-                                            const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ProgramStringARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1dARB) (GLuint, GLdouble);
-
-#define CALL_VertexAttrib1dARB(disp, parameters) \
-    (* GET_VertexAttrib1dARB(disp)) parameters
-static inline _glptr_VertexAttrib1dARB
-GET_VertexAttrib1dARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1dARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib1dARB));
-}
-
-static inline void
-SET_VertexAttrib1dARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1dARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1dvARB) (GLuint, const GLdouble *);
-
-#define CALL_VertexAttrib1dvARB(disp, parameters) \
-    (* GET_VertexAttrib1dvARB(disp)) parameters
-static inline _glptr_VertexAttrib1dvARB
-GET_VertexAttrib1dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1dvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib1dvARB));
-}
-
-static inline void
-SET_VertexAttrib1dvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1dvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1fARB) (GLuint, GLfloat);
-
-#define CALL_VertexAttrib1fARB(disp, parameters) \
-    (* GET_VertexAttrib1fARB(disp)) parameters
-static inline _glptr_VertexAttrib1fARB
-GET_VertexAttrib1fARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1fARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib1fARB));
-}
-
-static inline void
-SET_VertexAttrib1fARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1fvARB) (GLuint, const GLfloat *);
-
-#define CALL_VertexAttrib1fvARB(disp, parameters) \
-    (* GET_VertexAttrib1fvARB(disp)) parameters
-static inline _glptr_VertexAttrib1fvARB
-GET_VertexAttrib1fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1fvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib1fvARB));
-}
-
-static inline void
-SET_VertexAttrib1fvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1sARB) (GLuint, GLshort);
-
-#define CALL_VertexAttrib1sARB(disp, parameters) \
-    (* GET_VertexAttrib1sARB(disp)) parameters
-static inline _glptr_VertexAttrib1sARB
-GET_VertexAttrib1sARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1sARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib1sARB));
-}
-
-static inline void
-SET_VertexAttrib1sARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1sARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1svARB) (GLuint, const GLshort *);
-
-#define CALL_VertexAttrib1svARB(disp, parameters) \
-    (* GET_VertexAttrib1svARB(disp)) parameters
-static inline _glptr_VertexAttrib1svARB
-GET_VertexAttrib1svARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1svARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib1svARB));
-}
-
-static inline void
-SET_VertexAttrib1svARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1svARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2dARB) (GLuint, GLdouble,
-                                                     GLdouble);
-#define CALL_VertexAttrib2dARB(disp, parameters) \
-    (* GET_VertexAttrib2dARB(disp)) parameters
-static inline _glptr_VertexAttrib2dARB
-GET_VertexAttrib2dARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2dARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib2dARB));
-}
-
-static inline void
-SET_VertexAttrib2dARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2dARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2dvARB) (GLuint, const GLdouble *);
-
-#define CALL_VertexAttrib2dvARB(disp, parameters) \
-    (* GET_VertexAttrib2dvARB(disp)) parameters
-static inline _glptr_VertexAttrib2dvARB
-GET_VertexAttrib2dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2dvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib2dvARB));
-}
-
-static inline void
-SET_VertexAttrib2dvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2dvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2fARB) (GLuint, GLfloat, GLfloat);
-
-#define CALL_VertexAttrib2fARB(disp, parameters) \
-    (* GET_VertexAttrib2fARB(disp)) parameters
-static inline _glptr_VertexAttrib2fARB
-GET_VertexAttrib2fARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2fARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib2fARB));
-}
-
-static inline void
-SET_VertexAttrib2fARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2fvARB) (GLuint, const GLfloat *);
-
-#define CALL_VertexAttrib2fvARB(disp, parameters) \
-    (* GET_VertexAttrib2fvARB(disp)) parameters
-static inline _glptr_VertexAttrib2fvARB
-GET_VertexAttrib2fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2fvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib2fvARB));
-}
-
-static inline void
-SET_VertexAttrib2fvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2sARB) (GLuint, GLshort, GLshort);
-
-#define CALL_VertexAttrib2sARB(disp, parameters) \
-    (* GET_VertexAttrib2sARB(disp)) parameters
-static inline _glptr_VertexAttrib2sARB
-GET_VertexAttrib2sARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2sARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib2sARB));
-}
-
-static inline void
-SET_VertexAttrib2sARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2sARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2svARB) (GLuint, const GLshort *);
-
-#define CALL_VertexAttrib2svARB(disp, parameters) \
-    (* GET_VertexAttrib2svARB(disp)) parameters
-static inline _glptr_VertexAttrib2svARB
-GET_VertexAttrib2svARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2svARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib2svARB));
-}
-
-static inline void
-SET_VertexAttrib2svARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2svARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3dARB) (GLuint, GLdouble, GLdouble,
-                                                     GLdouble);
-#define CALL_VertexAttrib3dARB(disp, parameters) \
-    (* GET_VertexAttrib3dARB(disp)) parameters
-static inline _glptr_VertexAttrib3dARB
-GET_VertexAttrib3dARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3dARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib3dARB));
-}
-
-static inline void
-SET_VertexAttrib3dARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLdouble, GLdouble,
-                                             GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3dARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3dvARB) (GLuint, const GLdouble *);
-
-#define CALL_VertexAttrib3dvARB(disp, parameters) \
-    (* GET_VertexAttrib3dvARB(disp)) parameters
-static inline _glptr_VertexAttrib3dvARB
-GET_VertexAttrib3dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3dvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib3dvARB));
-}
-
-static inline void
-SET_VertexAttrib3dvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3dvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3fARB) (GLuint, GLfloat, GLfloat,
-                                                     GLfloat);
-#define CALL_VertexAttrib3fARB(disp, parameters) \
-    (* GET_VertexAttrib3fARB(disp)) parameters
-static inline _glptr_VertexAttrib3fARB
-GET_VertexAttrib3fARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3fARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib3fARB));
-}
-
-static inline void
-SET_VertexAttrib3fARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3fvARB) (GLuint, const GLfloat *);
-
-#define CALL_VertexAttrib3fvARB(disp, parameters) \
-    (* GET_VertexAttrib3fvARB(disp)) parameters
-static inline _glptr_VertexAttrib3fvARB
-GET_VertexAttrib3fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3fvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib3fvARB));
-}
-
-static inline void
-SET_VertexAttrib3fvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3sARB) (GLuint, GLshort, GLshort,
-                                                     GLshort);
-#define CALL_VertexAttrib3sARB(disp, parameters) \
-    (* GET_VertexAttrib3sARB(disp)) parameters
-static inline _glptr_VertexAttrib3sARB
-GET_VertexAttrib3sARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3sARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib3sARB));
-}
-
-static inline void
-SET_VertexAttrib3sARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3sARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3svARB) (GLuint, const GLshort *);
-
-#define CALL_VertexAttrib3svARB(disp, parameters) \
-    (* GET_VertexAttrib3svARB(disp)) parameters
-static inline _glptr_VertexAttrib3svARB
-GET_VertexAttrib3svARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3svARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib3svARB));
-}
-
-static inline void
-SET_VertexAttrib3svARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3svARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NbvARB) (GLuint, const GLbyte *);
-
-#define CALL_VertexAttrib4NbvARB(disp, parameters) \
-    (* GET_VertexAttrib4NbvARB(disp)) parameters
-static inline _glptr_VertexAttrib4NbvARB
-GET_VertexAttrib4NbvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NbvARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4NbvARB));
-}
-
-static inline void
-SET_VertexAttrib4NbvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NbvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NivARB) (GLuint, const GLint *);
-
-#define CALL_VertexAttrib4NivARB(disp, parameters) \
-    (* GET_VertexAttrib4NivARB(disp)) parameters
-static inline _glptr_VertexAttrib4NivARB
-GET_VertexAttrib4NivARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NivARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4NivARB));
-}
-
-static inline void
-SET_VertexAttrib4NivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NsvARB) (GLuint, const GLshort *);
-
-#define CALL_VertexAttrib4NsvARB(disp, parameters) \
-    (* GET_VertexAttrib4NsvARB(disp)) parameters
-static inline _glptr_VertexAttrib4NsvARB
-GET_VertexAttrib4NsvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NsvARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4NsvARB));
-}
-
-static inline void
-SET_VertexAttrib4NsvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NsvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NubARB) (GLuint, GLubyte, GLubyte,
-                                                       GLubyte, GLubyte);
-#define CALL_VertexAttrib4NubARB(disp, parameters) \
-    (* GET_VertexAttrib4NubARB(disp)) parameters
-static inline _glptr_VertexAttrib4NubARB
-GET_VertexAttrib4NubARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NubARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4NubARB));
-}
-
-static inline void
-SET_VertexAttrib4NubARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLubyte, GLubyte,
-                                               GLubyte, GLubyte))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NubARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NubvARB) (GLuint,
-                                                        const GLubyte *);
-#define CALL_VertexAttrib4NubvARB(disp, parameters) \
-    (* GET_VertexAttrib4NubvARB(disp)) parameters
-static inline _glptr_VertexAttrib4NubvARB
-GET_VertexAttrib4NubvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NubvARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttrib4NubvARB));
-}
-
-static inline void
-SET_VertexAttrib4NubvARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NubvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NuivARB) (GLuint, const GLuint *);
-
-#define CALL_VertexAttrib4NuivARB(disp, parameters) \
-    (* GET_VertexAttrib4NuivARB(disp)) parameters
-static inline _glptr_VertexAttrib4NuivARB
-GET_VertexAttrib4NuivARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NuivARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttrib4NuivARB));
-}
-
-static inline void
-SET_VertexAttrib4NuivARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NuivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NusvARB) (GLuint,
-                                                        const GLushort *);
-#define CALL_VertexAttrib4NusvARB(disp, parameters) \
-    (* GET_VertexAttrib4NusvARB(disp)) parameters
-static inline _glptr_VertexAttrib4NusvARB
-GET_VertexAttrib4NusvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NusvARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttrib4NusvARB));
-}
-
-static inline void
-SET_VertexAttrib4NusvARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NusvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4bvARB) (GLuint, const GLbyte *);
-
-#define CALL_VertexAttrib4bvARB(disp, parameters) \
-    (* GET_VertexAttrib4bvARB(disp)) parameters
-static inline _glptr_VertexAttrib4bvARB
-GET_VertexAttrib4bvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4bvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib4bvARB));
-}
-
-static inline void
-SET_VertexAttrib4bvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4bvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4dARB) (GLuint, GLdouble, GLdouble,
-                                                     GLdouble, GLdouble);
-#define CALL_VertexAttrib4dARB(disp, parameters) \
-    (* GET_VertexAttrib4dARB(disp)) parameters
-static inline _glptr_VertexAttrib4dARB
-GET_VertexAttrib4dARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4dARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4dARB));
-}
-
-static inline void
-SET_VertexAttrib4dARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLdouble, GLdouble,
-                                             GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4dARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4dvARB) (GLuint, const GLdouble *);
-
-#define CALL_VertexAttrib4dvARB(disp, parameters) \
-    (* GET_VertexAttrib4dvARB(disp)) parameters
-static inline _glptr_VertexAttrib4dvARB
-GET_VertexAttrib4dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4dvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib4dvARB));
-}
-
-static inline void
-SET_VertexAttrib4dvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4dvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4fARB) (GLuint, GLfloat, GLfloat,
-                                                     GLfloat, GLfloat);
-#define CALL_VertexAttrib4fARB(disp, parameters) \
-    (* GET_VertexAttrib4fARB(disp)) parameters
-static inline _glptr_VertexAttrib4fARB
-GET_VertexAttrib4fARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4fARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4fARB));
-}
-
-static inline void
-SET_VertexAttrib4fARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLfloat, GLfloat, GLfloat,
-                                             GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4fvARB) (GLuint, const GLfloat *);
-
-#define CALL_VertexAttrib4fvARB(disp, parameters) \
-    (* GET_VertexAttrib4fvARB(disp)) parameters
-static inline _glptr_VertexAttrib4fvARB
-GET_VertexAttrib4fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4fvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib4fvARB));
-}
-
-static inline void
-SET_VertexAttrib4fvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4ivARB) (GLuint, const GLint *);
-
-#define CALL_VertexAttrib4ivARB(disp, parameters) \
-    (* GET_VertexAttrib4ivARB(disp)) parameters
-static inline _glptr_VertexAttrib4ivARB
-GET_VertexAttrib4ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4ivARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib4ivARB));
-}
-
-static inline void
-SET_VertexAttrib4ivARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4ivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4sARB) (GLuint, GLshort, GLshort,
-                                                     GLshort, GLshort);
-#define CALL_VertexAttrib4sARB(disp, parameters) \
-    (* GET_VertexAttrib4sARB(disp)) parameters
-static inline _glptr_VertexAttrib4sARB
-GET_VertexAttrib4sARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4sARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4sARB));
-}
-
-static inline void
-SET_VertexAttrib4sARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLshort, GLshort, GLshort,
-                                             GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4sARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4svARB) (GLuint, const GLshort *);
-
-#define CALL_VertexAttrib4svARB(disp, parameters) \
-    (* GET_VertexAttrib4svARB(disp)) parameters
-static inline _glptr_VertexAttrib4svARB
-GET_VertexAttrib4svARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4svARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib4svARB));
-}
-
-static inline void
-SET_VertexAttrib4svARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4svARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4ubvARB) (GLuint, const GLubyte *);
-
-#define CALL_VertexAttrib4ubvARB(disp, parameters) \
-    (* GET_VertexAttrib4ubvARB(disp)) parameters
-static inline _glptr_VertexAttrib4ubvARB
-GET_VertexAttrib4ubvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4ubvARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4ubvARB));
-}
-
-static inline void
-SET_VertexAttrib4ubvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4ubvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4uivARB) (GLuint, const GLuint *);
-
-#define CALL_VertexAttrib4uivARB(disp, parameters) \
-    (* GET_VertexAttrib4uivARB(disp)) parameters
-static inline _glptr_VertexAttrib4uivARB
-GET_VertexAttrib4uivARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4uivARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4uivARB));
-}
-
-static inline void
-SET_VertexAttrib4uivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4uivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4usvARB) (GLuint,
-                                                       const GLushort *);
-#define CALL_VertexAttrib4usvARB(disp, parameters) \
-    (* GET_VertexAttrib4usvARB(disp)) parameters
-static inline _glptr_VertexAttrib4usvARB
-GET_VertexAttrib4usvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4usvARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4usvARB));
-}
-
-static inline void
-SET_VertexAttrib4usvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4usvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribPointerARB) (GLuint, GLint, GLenum,
-                                                          GLboolean, GLsizei,
-                                                          const GLvoid *);
-#define CALL_VertexAttribPointerARB(disp, parameters) \
-    (* GET_VertexAttribPointerARB(disp)) parameters
-static inline _glptr_VertexAttribPointerARB
-GET_VertexAttribPointerARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribPointerARB) (GET_by_offset
-                                            (disp,
-                                             _gloffset_VertexAttribPointerARB));
-}
-
-static inline void
-SET_VertexAttribPointerARB(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLuint, GLint, GLenum,
-                                                  GLboolean, GLsizei,
-                                                  const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribPointerARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindBufferARB) (GLenum, GLuint);
-
-#define CALL_BindBufferARB(disp, parameters) \
-    (* GET_BindBufferARB(disp)) parameters
-static inline _glptr_BindBufferARB
-GET_BindBufferARB(struct _glapi_table *disp)
-{
-    return (_glptr_BindBufferARB) (GET_by_offset
-                                   (disp, _gloffset_BindBufferARB));
-}
-
-static inline void
-SET_BindBufferARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindBufferARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BufferDataARB) (GLenum, GLsizeiptrARB,
-                                                 const GLvoid *, GLenum);
-#define CALL_BufferDataARB(disp, parameters) \
-    (* GET_BufferDataARB(disp)) parameters
-static inline _glptr_BufferDataARB
-GET_BufferDataARB(struct _glapi_table *disp)
-{
-    return (_glptr_BufferDataARB) (GET_by_offset
-                                   (disp, _gloffset_BufferDataARB));
-}
-
-static inline void
-SET_BufferDataARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLsizeiptrARB, const GLvoid *,
-                                         GLenum))
-{
-    SET_by_offset(disp, _gloffset_BufferDataARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BufferSubDataARB) (GLenum, GLintptrARB,
-                                                    GLsizeiptrARB,
-                                                    const GLvoid *);
-#define CALL_BufferSubDataARB(disp, parameters) \
-    (* GET_BufferSubDataARB(disp)) parameters
-static inline _glptr_BufferSubDataARB
-GET_BufferSubDataARB(struct _glapi_table *disp)
-{
-    return (_glptr_BufferSubDataARB) (GET_by_offset
-                                      (disp, _gloffset_BufferSubDataARB));
-}
-
-static inline void
-SET_BufferSubDataARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLintptrARB, GLsizeiptrARB,
-                                            const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_BufferSubDataARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteBuffersARB) (GLsizei, const GLuint *);
-
-#define CALL_DeleteBuffersARB(disp, parameters) \
-    (* GET_DeleteBuffersARB(disp)) parameters
-static inline _glptr_DeleteBuffersARB
-GET_DeleteBuffersARB(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteBuffersARB) (GET_by_offset
-                                      (disp, _gloffset_DeleteBuffersARB));
-}
-
-static inline void
-SET_DeleteBuffersARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteBuffersARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenBuffersARB) (GLsizei, GLuint *);
-
-#define CALL_GenBuffersARB(disp, parameters) \
-    (* GET_GenBuffersARB(disp)) parameters
-static inline _glptr_GenBuffersARB
-GET_GenBuffersARB(struct _glapi_table *disp)
-{
-    return (_glptr_GenBuffersARB) (GET_by_offset
-                                   (disp, _gloffset_GenBuffersARB));
-}
-
-static inline void
-SET_GenBuffersARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenBuffersARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetBufferParameterivARB) (GLenum, GLenum,
-                                                           GLint *);
-#define CALL_GetBufferParameterivARB(disp, parameters) \
-    (* GET_GetBufferParameterivARB(disp)) parameters
-static inline _glptr_GetBufferParameterivARB
-GET_GetBufferParameterivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetBufferParameterivARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetBufferParameterivARB));
-}
-
-static inline void
-SET_GetBufferParameterivARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetBufferParameterivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetBufferPointervARB) (GLenum, GLenum,
-                                                        GLvoid **);
-#define CALL_GetBufferPointervARB(disp, parameters) \
-    (* GET_GetBufferPointervARB(disp)) parameters
-static inline _glptr_GetBufferPointervARB
-GET_GetBufferPointervARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetBufferPointervARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetBufferPointervARB));
-}
-
-static inline void
-SET_GetBufferPointervARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLenum, GLvoid **))
-{
-    SET_by_offset(disp, _gloffset_GetBufferPointervARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetBufferSubDataARB) (GLenum, GLintptrARB,
-                                                       GLsizeiptrARB, GLvoid *);
-#define CALL_GetBufferSubDataARB(disp, parameters) \
-    (* GET_GetBufferSubDataARB(disp)) parameters
-static inline _glptr_GetBufferSubDataARB
-GET_GetBufferSubDataARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetBufferSubDataARB) (GET_by_offset
-                                         (disp, _gloffset_GetBufferSubDataARB));
-}
-
-static inline void
-SET_GetBufferSubDataARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLintptrARB,
-                                               GLsizeiptrARB, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetBufferSubDataARB, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsBufferARB) (GLuint);
-
-#define CALL_IsBufferARB(disp, parameters) \
-    (* GET_IsBufferARB(disp)) parameters
-static inline _glptr_IsBufferARB
-GET_IsBufferARB(struct _glapi_table *disp)
-{
-    return (_glptr_IsBufferARB) (GET_by_offset(disp, _gloffset_IsBufferARB));
-}
-
-static inline void
-SET_IsBufferARB(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsBufferARB, fn);
-}
-
-typedef GLvoid *(GLAPIENTRYP _glptr_MapBufferARB) (GLenum, GLenum);
-
-#define CALL_MapBufferARB(disp, parameters) \
-    (* GET_MapBufferARB(disp)) parameters
-static inline _glptr_MapBufferARB
-GET_MapBufferARB(struct _glapi_table *disp)
-{
-    return (_glptr_MapBufferARB) (GET_by_offset(disp, _gloffset_MapBufferARB));
-}
-
-static inline void
-SET_MapBufferARB(struct _glapi_table *disp,
-                 GLvoid * (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_MapBufferARB, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_UnmapBufferARB) (GLenum);
-
-#define CALL_UnmapBufferARB(disp, parameters) \
-    (* GET_UnmapBufferARB(disp)) parameters
-static inline _glptr_UnmapBufferARB
-GET_UnmapBufferARB(struct _glapi_table *disp)
-{
-    return (_glptr_UnmapBufferARB) (GET_by_offset
-                                    (disp, _gloffset_UnmapBufferARB));
-}
-
-static inline void
-SET_UnmapBufferARB(struct _glapi_table *disp,
-                   GLboolean(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_UnmapBufferARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BeginQueryARB) (GLenum, GLuint);
-
-#define CALL_BeginQueryARB(disp, parameters) \
-    (* GET_BeginQueryARB(disp)) parameters
-static inline _glptr_BeginQueryARB
-GET_BeginQueryARB(struct _glapi_table *disp)
-{
-    return (_glptr_BeginQueryARB) (GET_by_offset
-                                   (disp, _gloffset_BeginQueryARB));
-}
-
-static inline void
-SET_BeginQueryARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BeginQueryARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteQueriesARB) (GLsizei, const GLuint *);
-
-#define CALL_DeleteQueriesARB(disp, parameters) \
-    (* GET_DeleteQueriesARB(disp)) parameters
-static inline _glptr_DeleteQueriesARB
-GET_DeleteQueriesARB(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteQueriesARB) (GET_by_offset
-                                      (disp, _gloffset_DeleteQueriesARB));
-}
-
-static inline void
-SET_DeleteQueriesARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteQueriesARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EndQueryARB) (GLenum);
-
-#define CALL_EndQueryARB(disp, parameters) \
-    (* GET_EndQueryARB(disp)) parameters
-static inline _glptr_EndQueryARB
-GET_EndQueryARB(struct _glapi_table *disp)
-{
-    return (_glptr_EndQueryARB) (GET_by_offset(disp, _gloffset_EndQueryARB));
-}
-
-static inline void
-SET_EndQueryARB(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_EndQueryARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenQueriesARB) (GLsizei, GLuint *);
-
-#define CALL_GenQueriesARB(disp, parameters) \
-    (* GET_GenQueriesARB(disp)) parameters
-static inline _glptr_GenQueriesARB
-GET_GenQueriesARB(struct _glapi_table *disp)
-{
-    return (_glptr_GenQueriesARB) (GET_by_offset
-                                   (disp, _gloffset_GenQueriesARB));
-}
-
-static inline void
-SET_GenQueriesARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenQueriesARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetQueryObjectivARB) (GLuint, GLenum, GLint *);
-
-#define CALL_GetQueryObjectivARB(disp, parameters) \
-    (* GET_GetQueryObjectivARB(disp)) parameters
-static inline _glptr_GetQueryObjectivARB
-GET_GetQueryObjectivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetQueryObjectivARB) (GET_by_offset
-                                         (disp, _gloffset_GetQueryObjectivARB));
-}
-
-static inline void
-SET_GetQueryObjectivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetQueryObjectivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetQueryObjectuivARB) (GLuint, GLenum,
-                                                        GLuint *);
-#define CALL_GetQueryObjectuivARB(disp, parameters) \
-    (* GET_GetQueryObjectuivARB(disp)) parameters
-static inline _glptr_GetQueryObjectuivARB
-GET_GetQueryObjectuivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetQueryObjectuivARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetQueryObjectuivARB));
-}
-
-static inline void
-SET_GetQueryObjectuivARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, GLenum, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetQueryObjectuivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetQueryivARB) (GLenum, GLenum, GLint *);
-
-#define CALL_GetQueryivARB(disp, parameters) \
-    (* GET_GetQueryivARB(disp)) parameters
-static inline _glptr_GetQueryivARB
-GET_GetQueryivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetQueryivARB) (GET_by_offset
-                                   (disp, _gloffset_GetQueryivARB));
-}
-
-static inline void
-SET_GetQueryivARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetQueryivARB, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsQueryARB) (GLuint);
-
-#define CALL_IsQueryARB(disp, parameters) \
-    (* GET_IsQueryARB(disp)) parameters
-static inline _glptr_IsQueryARB
-GET_IsQueryARB(struct _glapi_table *disp)
-{
-    return (_glptr_IsQueryARB) (GET_by_offset(disp, _gloffset_IsQueryARB));
-}
-
-static inline void
-SET_IsQueryARB(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsQueryARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_AttachObjectARB) (GLhandleARB, GLhandleARB);
-
-#define CALL_AttachObjectARB(disp, parameters) \
-    (* GET_AttachObjectARB(disp)) parameters
-static inline _glptr_AttachObjectARB
-GET_AttachObjectARB(struct _glapi_table *disp)
-{
-    return (_glptr_AttachObjectARB) (GET_by_offset
-                                     (disp, _gloffset_AttachObjectARB));
-}
-
-static inline void
-SET_AttachObjectARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLhandleARB, GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_AttachObjectARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompileShaderARB) (GLhandleARB);
-
-#define CALL_CompileShaderARB(disp, parameters) \
-    (* GET_CompileShaderARB(disp)) parameters
-static inline _glptr_CompileShaderARB
-GET_CompileShaderARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompileShaderARB) (GET_by_offset
-                                      (disp, _gloffset_CompileShaderARB));
-}
-
-static inline void
-SET_CompileShaderARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_CompileShaderARB, fn);
-}
-
-typedef GLhandleARB(GLAPIENTRYP _glptr_CreateProgramObjectARB) (void);
-
-#define CALL_CreateProgramObjectARB(disp, parameters) \
-    (* GET_CreateProgramObjectARB(disp)) parameters
-static inline _glptr_CreateProgramObjectARB
-GET_CreateProgramObjectARB(struct _glapi_table *disp)
-{
-    return (_glptr_CreateProgramObjectARB) (GET_by_offset
-                                            (disp,
-                                             _gloffset_CreateProgramObjectARB));
-}
-
-static inline void
-SET_CreateProgramObjectARB(struct _glapi_table *disp,
-                           GLhandleARB(GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_CreateProgramObjectARB, fn);
-}
-
-typedef GLhandleARB(GLAPIENTRYP _glptr_CreateShaderObjectARB) (GLenum);
-
-#define CALL_CreateShaderObjectARB(disp, parameters) \
-    (* GET_CreateShaderObjectARB(disp)) parameters
-static inline _glptr_CreateShaderObjectARB
-GET_CreateShaderObjectARB(struct _glapi_table *disp)
-{
-    return (_glptr_CreateShaderObjectARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_CreateShaderObjectARB));
-}
-
-static inline void
-SET_CreateShaderObjectARB(struct _glapi_table *disp,
-                          GLhandleARB(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_CreateShaderObjectARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteObjectARB) (GLhandleARB);
-
-#define CALL_DeleteObjectARB(disp, parameters) \
-    (* GET_DeleteObjectARB(disp)) parameters
-static inline _glptr_DeleteObjectARB
-GET_DeleteObjectARB(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteObjectARB) (GET_by_offset
-                                     (disp, _gloffset_DeleteObjectARB));
-}
-
-static inline void
-SET_DeleteObjectARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_DeleteObjectARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DetachObjectARB) (GLhandleARB, GLhandleARB);
-
-#define CALL_DetachObjectARB(disp, parameters) \
-    (* GET_DetachObjectARB(disp)) parameters
-static inline _glptr_DetachObjectARB
-GET_DetachObjectARB(struct _glapi_table *disp)
-{
-    return (_glptr_DetachObjectARB) (GET_by_offset
-                                     (disp, _gloffset_DetachObjectARB));
-}
-
-static inline void
-SET_DetachObjectARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLhandleARB, GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_DetachObjectARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetActiveUniformARB) (GLhandleARB, GLuint,
-                                                       GLsizei, GLsizei *,
-                                                       GLint *, GLenum *,
-                                                       GLcharARB *);
-#define CALL_GetActiveUniformARB(disp, parameters) \
-    (* GET_GetActiveUniformARB(disp)) parameters
-static inline _glptr_GetActiveUniformARB
-GET_GetActiveUniformARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetActiveUniformARB) (GET_by_offset
-                                         (disp, _gloffset_GetActiveUniformARB));
-}
-
-static inline void
-SET_GetActiveUniformARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLhandleARB, GLuint, GLsizei,
-                                               GLsizei *, GLint *, GLenum *,
-                                               GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_GetActiveUniformARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetAttachedObjectsARB) (GLhandleARB, GLsizei,
-                                                         GLsizei *,
-                                                         GLhandleARB *);
-#define CALL_GetAttachedObjectsARB(disp, parameters) \
-    (* GET_GetAttachedObjectsARB(disp)) parameters
-static inline _glptr_GetAttachedObjectsARB
-GET_GetAttachedObjectsARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetAttachedObjectsARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetAttachedObjectsARB));
-}
-
-static inline void
-SET_GetAttachedObjectsARB(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLhandleARB, GLsizei,
-                                                 GLsizei *, GLhandleARB *))
-{
-    SET_by_offset(disp, _gloffset_GetAttachedObjectsARB, fn);
-}
-
-typedef GLhandleARB(GLAPIENTRYP _glptr_GetHandleARB) (GLenum);
-
-#define CALL_GetHandleARB(disp, parameters) \
-    (* GET_GetHandleARB(disp)) parameters
-static inline _glptr_GetHandleARB
-GET_GetHandleARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetHandleARB) (GET_by_offset(disp, _gloffset_GetHandleARB));
-}
-
-static inline void
-SET_GetHandleARB(struct _glapi_table *disp,
-                 GLhandleARB(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_GetHandleARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetInfoLogARB) (GLhandleARB, GLsizei,
-                                                 GLsizei *, GLcharARB *);
-#define CALL_GetInfoLogARB(disp, parameters) \
-    (* GET_GetInfoLogARB(disp)) parameters
-static inline _glptr_GetInfoLogARB
-GET_GetInfoLogARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetInfoLogARB) (GET_by_offset
-                                   (disp, _gloffset_GetInfoLogARB));
-}
-
-static inline void
-SET_GetInfoLogARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLhandleARB, GLsizei, GLsizei *,
-                                         GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_GetInfoLogARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetObjectParameterfvARB) (GLhandleARB, GLenum,
-                                                           GLfloat *);
-#define CALL_GetObjectParameterfvARB(disp, parameters) \
-    (* GET_GetObjectParameterfvARB(disp)) parameters
-static inline _glptr_GetObjectParameterfvARB
-GET_GetObjectParameterfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetObjectParameterfvARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetObjectParameterfvARB));
-}
-
-static inline void
-SET_GetObjectParameterfvARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLhandleARB, GLenum,
-                                                   GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetObjectParameterfvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetObjectParameterivARB) (GLhandleARB, GLenum,
-                                                           GLint *);
-#define CALL_GetObjectParameterivARB(disp, parameters) \
-    (* GET_GetObjectParameterivARB(disp)) parameters
-static inline _glptr_GetObjectParameterivARB
-GET_GetObjectParameterivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetObjectParameterivARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetObjectParameterivARB));
-}
-
-static inline void
-SET_GetObjectParameterivARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLhandleARB, GLenum,
-                                                   GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetObjectParameterivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetShaderSourceARB) (GLhandleARB, GLsizei,
-                                                      GLsizei *, GLcharARB *);
-#define CALL_GetShaderSourceARB(disp, parameters) \
-    (* GET_GetShaderSourceARB(disp)) parameters
-static inline _glptr_GetShaderSourceARB
-GET_GetShaderSourceARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetShaderSourceARB) (GET_by_offset
-                                        (disp, _gloffset_GetShaderSourceARB));
-}
-
-static inline void
-SET_GetShaderSourceARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLhandleARB, GLsizei, GLsizei *,
-                                              GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_GetShaderSourceARB, fn);
-}
-
-typedef GLint(GLAPIENTRYP _glptr_GetUniformLocationARB) (GLhandleARB,
-                                                         const GLcharARB *);
-#define CALL_GetUniformLocationARB(disp, parameters) \
-    (* GET_GetUniformLocationARB(disp)) parameters
-static inline _glptr_GetUniformLocationARB
-GET_GetUniformLocationARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetUniformLocationARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetUniformLocationARB));
-}
-
-static inline void
-SET_GetUniformLocationARB(struct _glapi_table *disp,
-                          GLint(GLAPIENTRYP fn) (GLhandleARB,
-                                                 const GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_GetUniformLocationARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetUniformfvARB) (GLhandleARB, GLint,
-                                                   GLfloat *);
-#define CALL_GetUniformfvARB(disp, parameters) \
-    (* GET_GetUniformfvARB(disp)) parameters
-static inline _glptr_GetUniformfvARB
-GET_GetUniformfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetUniformfvARB) (GET_by_offset
-                                     (disp, _gloffset_GetUniformfvARB));
-}
-
-static inline void
-SET_GetUniformfvARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLhandleARB, GLint, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetUniformfvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetUniformivARB) (GLhandleARB, GLint, GLint *);
-
-#define CALL_GetUniformivARB(disp, parameters) \
-    (* GET_GetUniformivARB(disp)) parameters
-static inline _glptr_GetUniformivARB
-GET_GetUniformivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetUniformivARB) (GET_by_offset
-                                     (disp, _gloffset_GetUniformivARB));
-}
-
-static inline void
-SET_GetUniformivARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLhandleARB, GLint, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetUniformivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LinkProgramARB) (GLhandleARB);
-
-#define CALL_LinkProgramARB(disp, parameters) \
-    (* GET_LinkProgramARB(disp)) parameters
-static inline _glptr_LinkProgramARB
-GET_LinkProgramARB(struct _glapi_table *disp)
-{
-    return (_glptr_LinkProgramARB) (GET_by_offset
-                                    (disp, _gloffset_LinkProgramARB));
-}
-
-static inline void
-SET_LinkProgramARB(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_LinkProgramARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ShaderSourceARB) (GLhandleARB, GLsizei,
-                                                   const GLcharARB **,
-                                                   const GLint *);
-#define CALL_ShaderSourceARB(disp, parameters) \
-    (* GET_ShaderSourceARB(disp)) parameters
-static inline _glptr_ShaderSourceARB
-GET_ShaderSourceARB(struct _glapi_table *disp)
-{
-    return (_glptr_ShaderSourceARB) (GET_by_offset
-                                     (disp, _gloffset_ShaderSourceARB));
-}
-
-static inline void
-SET_ShaderSourceARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLhandleARB, GLsizei,
-                                           const GLcharARB **, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_ShaderSourceARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform1fARB) (GLint, GLfloat);
-
-#define CALL_Uniform1fARB(disp, parameters) \
-    (* GET_Uniform1fARB(disp)) parameters
-static inline _glptr_Uniform1fARB
-GET_Uniform1fARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform1fARB) (GET_by_offset(disp, _gloffset_Uniform1fARB));
-}
-
-static inline void
-SET_Uniform1fARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Uniform1fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform1fvARB) (GLint, GLsizei,
-                                                 const GLfloat *);
-#define CALL_Uniform1fvARB(disp, parameters) \
-    (* GET_Uniform1fvARB(disp)) parameters
-static inline _glptr_Uniform1fvARB
-GET_Uniform1fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform1fvARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform1fvARB));
-}
-
-static inline void
-SET_Uniform1fvARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Uniform1fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform1iARB) (GLint, GLint);
-
-#define CALL_Uniform1iARB(disp, parameters) \
-    (* GET_Uniform1iARB(disp)) parameters
-static inline _glptr_Uniform1iARB
-GET_Uniform1iARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform1iARB) (GET_by_offset(disp, _gloffset_Uniform1iARB));
-}
-
-static inline void
-SET_Uniform1iARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Uniform1iARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform1ivARB) (GLint, GLsizei, const GLint *);
-
-#define CALL_Uniform1ivARB(disp, parameters) \
-    (* GET_Uniform1ivARB(disp)) parameters
-static inline _glptr_Uniform1ivARB
-GET_Uniform1ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform1ivARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform1ivARB));
-}
-
-static inline void
-SET_Uniform1ivARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform1ivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform2fARB) (GLint, GLfloat, GLfloat);
-
-#define CALL_Uniform2fARB(disp, parameters) \
-    (* GET_Uniform2fARB(disp)) parameters
-static inline _glptr_Uniform2fARB
-GET_Uniform2fARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform2fARB) (GET_by_offset(disp, _gloffset_Uniform2fARB));
-}
-
-static inline void
-SET_Uniform2fARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Uniform2fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform2fvARB) (GLint, GLsizei,
-                                                 const GLfloat *);
-#define CALL_Uniform2fvARB(disp, parameters) \
-    (* GET_Uniform2fvARB(disp)) parameters
-static inline _glptr_Uniform2fvARB
-GET_Uniform2fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform2fvARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform2fvARB));
-}
-
-static inline void
-SET_Uniform2fvARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Uniform2fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform2iARB) (GLint, GLint, GLint);
-
-#define CALL_Uniform2iARB(disp, parameters) \
-    (* GET_Uniform2iARB(disp)) parameters
-static inline _glptr_Uniform2iARB
-GET_Uniform2iARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform2iARB) (GET_by_offset(disp, _gloffset_Uniform2iARB));
-}
-
-static inline void
-SET_Uniform2iARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Uniform2iARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform2ivARB) (GLint, GLsizei, const GLint *);
-
-#define CALL_Uniform2ivARB(disp, parameters) \
-    (* GET_Uniform2ivARB(disp)) parameters
-static inline _glptr_Uniform2ivARB
-GET_Uniform2ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform2ivARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform2ivARB));
-}
-
-static inline void
-SET_Uniform2ivARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform2ivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform3fARB) (GLint, GLfloat, GLfloat,
-                                                GLfloat);
-#define CALL_Uniform3fARB(disp, parameters) \
-    (* GET_Uniform3fARB(disp)) parameters
-static inline _glptr_Uniform3fARB
-GET_Uniform3fARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform3fARB) (GET_by_offset(disp, _gloffset_Uniform3fARB));
-}
-
-static inline void
-SET_Uniform3fARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Uniform3fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform3fvARB) (GLint, GLsizei,
-                                                 const GLfloat *);
-#define CALL_Uniform3fvARB(disp, parameters) \
-    (* GET_Uniform3fvARB(disp)) parameters
-static inline _glptr_Uniform3fvARB
-GET_Uniform3fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform3fvARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform3fvARB));
-}
-
-static inline void
-SET_Uniform3fvARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Uniform3fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform3iARB) (GLint, GLint, GLint, GLint);
-
-#define CALL_Uniform3iARB(disp, parameters) \
-    (* GET_Uniform3iARB(disp)) parameters
-static inline _glptr_Uniform3iARB
-GET_Uniform3iARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform3iARB) (GET_by_offset(disp, _gloffset_Uniform3iARB));
-}
-
-static inline void
-SET_Uniform3iARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Uniform3iARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform3ivARB) (GLint, GLsizei, const GLint *);
-
-#define CALL_Uniform3ivARB(disp, parameters) \
-    (* GET_Uniform3ivARB(disp)) parameters
-static inline _glptr_Uniform3ivARB
-GET_Uniform3ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform3ivARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform3ivARB));
-}
-
-static inline void
-SET_Uniform3ivARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform3ivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform4fARB) (GLint, GLfloat, GLfloat,
-                                                GLfloat, GLfloat);
-#define CALL_Uniform4fARB(disp, parameters) \
-    (* GET_Uniform4fARB(disp)) parameters
-static inline _glptr_Uniform4fARB
-GET_Uniform4fARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform4fARB) (GET_by_offset(disp, _gloffset_Uniform4fARB));
-}
-
-static inline void
-SET_Uniform4fARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLfloat, GLfloat, GLfloat,
-                                        GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Uniform4fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform4fvARB) (GLint, GLsizei,
-                                                 const GLfloat *);
-#define CALL_Uniform4fvARB(disp, parameters) \
-    (* GET_Uniform4fvARB(disp)) parameters
-static inline _glptr_Uniform4fvARB
-GET_Uniform4fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform4fvARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform4fvARB));
-}
-
-static inline void
-SET_Uniform4fvARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Uniform4fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform4iARB) (GLint, GLint, GLint, GLint,
-                                                GLint);
-#define CALL_Uniform4iARB(disp, parameters) \
-    (* GET_Uniform4iARB(disp)) parameters
-static inline _glptr_Uniform4iARB
-GET_Uniform4iARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform4iARB) (GET_by_offset(disp, _gloffset_Uniform4iARB));
-}
-
-static inline void
-SET_Uniform4iARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Uniform4iARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform4ivARB) (GLint, GLsizei, const GLint *);
-
-#define CALL_Uniform4ivARB(disp, parameters) \
-    (* GET_Uniform4ivARB(disp)) parameters
-static inline _glptr_Uniform4ivARB
-GET_Uniform4ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform4ivARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform4ivARB));
-}
-
-static inline void
-SET_Uniform4ivARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform4ivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UniformMatrix2fvARB) (GLint, GLsizei,
-                                                       GLboolean,
-                                                       const GLfloat *);
-#define CALL_UniformMatrix2fvARB(disp, parameters) \
-    (* GET_UniformMatrix2fvARB(disp)) parameters
-static inline _glptr_UniformMatrix2fvARB
-GET_UniformMatrix2fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix2fvARB) (GET_by_offset
-                                         (disp, _gloffset_UniformMatrix2fvARB));
-}
-
-static inline void
-SET_UniformMatrix2fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                               const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix2fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UniformMatrix3fvARB) (GLint, GLsizei,
-                                                       GLboolean,
-                                                       const GLfloat *);
-#define CALL_UniformMatrix3fvARB(disp, parameters) \
-    (* GET_UniformMatrix3fvARB(disp)) parameters
-static inline _glptr_UniformMatrix3fvARB
-GET_UniformMatrix3fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix3fvARB) (GET_by_offset
-                                         (disp, _gloffset_UniformMatrix3fvARB));
-}
-
-static inline void
-SET_UniformMatrix3fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                               const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix3fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UniformMatrix4fvARB) (GLint, GLsizei,
-                                                       GLboolean,
-                                                       const GLfloat *);
-#define CALL_UniformMatrix4fvARB(disp, parameters) \
-    (* GET_UniformMatrix4fvARB(disp)) parameters
-static inline _glptr_UniformMatrix4fvARB
-GET_UniformMatrix4fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix4fvARB) (GET_by_offset
-                                         (disp, _gloffset_UniformMatrix4fvARB));
-}
-
-static inline void
-SET_UniformMatrix4fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                               const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix4fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UseProgramObjectARB) (GLhandleARB);
-
-#define CALL_UseProgramObjectARB(disp, parameters) \
-    (* GET_UseProgramObjectARB(disp)) parameters
-static inline _glptr_UseProgramObjectARB
-GET_UseProgramObjectARB(struct _glapi_table *disp)
-{
-    return (_glptr_UseProgramObjectARB) (GET_by_offset
-                                         (disp, _gloffset_UseProgramObjectARB));
-}
-
-static inline void
-SET_UseProgramObjectARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_UseProgramObjectARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ValidateProgramARB) (GLhandleARB);
-
-#define CALL_ValidateProgramARB(disp, parameters) \
-    (* GET_ValidateProgramARB(disp)) parameters
-static inline _glptr_ValidateProgramARB
-GET_ValidateProgramARB(struct _glapi_table *disp)
-{
-    return (_glptr_ValidateProgramARB) (GET_by_offset
-                                        (disp, _gloffset_ValidateProgramARB));
-}
-
-static inline void
-SET_ValidateProgramARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_ValidateProgramARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindAttribLocationARB) (GLhandleARB, GLuint,
-                                                         const GLcharARB *);
-#define CALL_BindAttribLocationARB(disp, parameters) \
-    (* GET_BindAttribLocationARB(disp)) parameters
-static inline _glptr_BindAttribLocationARB
-GET_BindAttribLocationARB(struct _glapi_table *disp)
-{
-    return (_glptr_BindAttribLocationARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_BindAttribLocationARB));
-}
-
-static inline void
-SET_BindAttribLocationARB(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLhandleARB, GLuint,
-                                                 const GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_BindAttribLocationARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetActiveAttribARB) (GLhandleARB, GLuint,
-                                                      GLsizei, GLsizei *,
-                                                      GLint *, GLenum *,
-                                                      GLcharARB *);
-#define CALL_GetActiveAttribARB(disp, parameters) \
-    (* GET_GetActiveAttribARB(disp)) parameters
-static inline _glptr_GetActiveAttribARB
-GET_GetActiveAttribARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetActiveAttribARB) (GET_by_offset
-                                        (disp, _gloffset_GetActiveAttribARB));
-}
-
-static inline void
-SET_GetActiveAttribARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLhandleARB, GLuint, GLsizei,
-                                              GLsizei *, GLint *, GLenum *,
-                                              GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_GetActiveAttribARB, fn);
-}
-
-typedef GLint(GLAPIENTRYP _glptr_GetAttribLocationARB) (GLhandleARB,
-                                                        const GLcharARB *);
-#define CALL_GetAttribLocationARB(disp, parameters) \
-    (* GET_GetAttribLocationARB(disp)) parameters
-static inline _glptr_GetAttribLocationARB
-GET_GetAttribLocationARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetAttribLocationARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetAttribLocationARB));
-}
-
-static inline void
-SET_GetAttribLocationARB(struct _glapi_table *disp,
-                         GLint(GLAPIENTRYP fn) (GLhandleARB, const GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_GetAttribLocationARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawBuffersARB) (GLsizei, const GLenum *);
-
-#define CALL_DrawBuffersARB(disp, parameters) \
-    (* GET_DrawBuffersARB(disp)) parameters
-static inline _glptr_DrawBuffersARB
-GET_DrawBuffersARB(struct _glapi_table *disp)
-{
-    return (_glptr_DrawBuffersARB) (GET_by_offset
-                                    (disp, _gloffset_DrawBuffersARB));
-}
-
-static inline void
-SET_DrawBuffersARB(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLsizei, const GLenum *))
-{
-    SET_by_offset(disp, _gloffset_DrawBuffersARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClampColorARB) (GLenum, GLenum);
-
-#define CALL_ClampColorARB(disp, parameters) \
-    (* GET_ClampColorARB(disp)) parameters
-static inline _glptr_ClampColorARB
-GET_ClampColorARB(struct _glapi_table *disp)
-{
-    return (_glptr_ClampColorARB) (GET_by_offset
-                                   (disp, _gloffset_ClampColorARB));
-}
-
-static inline void
-SET_ClampColorARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_ClampColorARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawArraysInstancedARB) (GLenum, GLint,
-                                                          GLsizei, GLsizei);
-#define CALL_DrawArraysInstancedARB(disp, parameters) \
-    (* GET_DrawArraysInstancedARB(disp)) parameters
-static inline _glptr_DrawArraysInstancedARB
-GET_DrawArraysInstancedARB(struct _glapi_table *disp)
-{
-    return (_glptr_DrawArraysInstancedARB) (GET_by_offset
-                                            (disp,
-                                             _gloffset_DrawArraysInstancedARB));
-}
-
-static inline void
-SET_DrawArraysInstancedARB(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLint, GLsizei,
-                                                  GLsizei))
-{
-    SET_by_offset(disp, _gloffset_DrawArraysInstancedARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedARB) (GLenum, GLsizei,
-                                                            GLenum,
-                                                            const GLvoid *,
-                                                            GLsizei);
-#define CALL_DrawElementsInstancedARB(disp, parameters) \
-    (* GET_DrawElementsInstancedARB(disp)) parameters
-static inline _glptr_DrawElementsInstancedARB
-GET_DrawElementsInstancedARB(struct _glapi_table *disp)
-{
-    return (_glptr_DrawElementsInstancedARB) (GET_by_offset
-                                              (disp,
-                                               _gloffset_DrawElementsInstancedARB));
-}
-
-static inline void
-SET_DrawElementsInstancedARB(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum,
-                                                    const GLvoid *, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_DrawElementsInstancedARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RenderbufferStorageMultisample) (GLenum,
-                                                                  GLsizei,
-                                                                  GLenum,
-                                                                  GLsizei,
-                                                                  GLsizei);
-#define CALL_RenderbufferStorageMultisample(disp, parameters) \
-    (* GET_RenderbufferStorageMultisample(disp)) parameters
-static inline _glptr_RenderbufferStorageMultisample
-GET_RenderbufferStorageMultisample(struct _glapi_table *disp)
-{
-    return (_glptr_RenderbufferStorageMultisample) (GET_by_offset
-                                                    (disp,
-                                                     _gloffset_RenderbufferStorageMultisample));
-}
-
-static inline void
-SET_RenderbufferStorageMultisample(struct _glapi_table *disp,
-                                   void (GLAPIENTRYP fn) (GLenum, GLsizei,
-                                                          GLenum, GLsizei,
-                                                          GLsizei))
-{
-    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
-static inline _glptr_FramebufferTextureFaceARB
-GET_FramebufferTextureFaceARB(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTextureFaceARB) (GET_by_offset
-                                               (disp,
-                                                _gloffset_FramebufferTextureFaceARB));
-}
-
-static inline void
-SET_FramebufferTextureFaceARB(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint,
-                                                     GLint, GLenum))
-{
-    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
-static inline _glptr_VertexAttribDivisorARB
-GET_VertexAttribDivisorARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribDivisorARB) (GET_by_offset
-                                            (disp,
-                                             _gloffset_VertexAttribDivisorARB));
-}
-
-static inline void
-SET_VertexAttribDivisorARB(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribDivisorARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FlushMappedBufferRange) (GLenum, GLintptr,
-                                                          GLsizeiptr);
-#define CALL_FlushMappedBufferRange(disp, parameters) \
-    (* GET_FlushMappedBufferRange(disp)) parameters
-static inline _glptr_FlushMappedBufferRange
-GET_FlushMappedBufferRange(struct _glapi_table *disp)
-{
-    return (_glptr_FlushMappedBufferRange) (GET_by_offset
-                                            (disp,
-                                             _gloffset_FlushMappedBufferRange));
-}
-
-static inline void
-SET_FlushMappedBufferRange(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLintptr, GLsizeiptr))
-{
-    SET_by_offset(disp, _gloffset_FlushMappedBufferRange, fn);
-}
-
-typedef GLvoid *(GLAPIENTRYP _glptr_MapBufferRange) (GLenum, GLintptr,
-                                                     GLsizeiptr, GLbitfield);
-#define CALL_MapBufferRange(disp, parameters) \
-    (* GET_MapBufferRange(disp)) parameters
-static inline _glptr_MapBufferRange
-GET_MapBufferRange(struct _glapi_table *disp)
-{
-    return (_glptr_MapBufferRange) (GET_by_offset
-                                    (disp, _gloffset_MapBufferRange));
-}
-
-static inline void
-SET_MapBufferRange(struct _glapi_table *disp,
-                   GLvoid * (GLAPIENTRYP fn) (GLenum, GLintptr, GLsizeiptr,
-                                              GLbitfield))
-{
-    SET_by_offset(disp, _gloffset_MapBufferRange, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexBufferARB) (GLenum, GLenum, GLuint);
-
-#define CALL_TexBufferARB(disp, parameters) \
-    (* GET_TexBufferARB(disp)) parameters
-static inline _glptr_TexBufferARB
-GET_TexBufferARB(struct _glapi_table *disp)
-{
-    return (_glptr_TexBufferARB) (GET_by_offset(disp, _gloffset_TexBufferARB));
-}
-
-static inline void
-SET_TexBufferARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_TexBufferARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindVertexArray) (GLuint);
-
-#define CALL_BindVertexArray(disp, parameters) \
-    (* GET_BindVertexArray(disp)) parameters
-static inline _glptr_BindVertexArray
-GET_BindVertexArray(struct _glapi_table *disp)
-{
-    return (_glptr_BindVertexArray) (GET_by_offset
-                                     (disp, _gloffset_BindVertexArray));
-}
-
-static inline void
-SET_BindVertexArray(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindVertexArray, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenVertexArrays) (GLsizei, GLuint *);
-
-#define CALL_GenVertexArrays(disp, parameters) \
-    (* GET_GenVertexArrays(disp)) parameters
-static inline _glptr_GenVertexArrays
-GET_GenVertexArrays(struct _glapi_table *disp)
-{
-    return (_glptr_GenVertexArrays) (GET_by_offset
-                                     (disp, _gloffset_GenVertexArrays));
-}
-
-static inline void
-SET_GenVertexArrays(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenVertexArrays, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CopyBufferSubData) (GLenum, GLenum, GLintptr,
-                                                     GLintptr, GLsizeiptr);
-#define CALL_CopyBufferSubData(disp, parameters) \
-    (* GET_CopyBufferSubData(disp)) parameters
-static inline _glptr_CopyBufferSubData
-GET_CopyBufferSubData(struct _glapi_table *disp)
-{
-    return (_glptr_CopyBufferSubData) (GET_by_offset
-                                       (disp, _gloffset_CopyBufferSubData));
-}
-
-static inline void
-SET_CopyBufferSubData(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLintptr, GLintptr,
-                                             GLsizeiptr))
-{
-    SET_by_offset(disp, _gloffset_CopyBufferSubData, fn);
-}
-
-typedef GLenum(GLAPIENTRYP _glptr_ClientWaitSync) (GLsync, GLbitfield,
-                                                   GLuint64);
-#define CALL_ClientWaitSync(disp, parameters) \
-    (* GET_ClientWaitSync(disp)) parameters
-static inline _glptr_ClientWaitSync
-GET_ClientWaitSync(struct _glapi_table *disp)
-{
-    return (_glptr_ClientWaitSync) (GET_by_offset
-                                    (disp, _gloffset_ClientWaitSync));
-}
-
-static inline void
-SET_ClientWaitSync(struct _glapi_table *disp,
-                   GLenum(GLAPIENTRYP fn) (GLsync, GLbitfield, GLuint64))
-{
-    SET_by_offset(disp, _gloffset_ClientWaitSync, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteSync) (GLsync);
-
-#define CALL_DeleteSync(disp, parameters) \
-    (* GET_DeleteSync(disp)) parameters
-static inline _glptr_DeleteSync
-GET_DeleteSync(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteSync) (GET_by_offset(disp, _gloffset_DeleteSync));
-}
-
-static inline void
-SET_DeleteSync(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLsync))
-{
-    SET_by_offset(disp, _gloffset_DeleteSync, fn);
-}
-
-typedef GLsync(GLAPIENTRYP _glptr_FenceSync) (GLenum, GLbitfield);
-
-#define CALL_FenceSync(disp, parameters) \
-    (* GET_FenceSync(disp)) parameters
-static inline _glptr_FenceSync
-GET_FenceSync(struct _glapi_table *disp)
-{
-    return (_glptr_FenceSync) (GET_by_offset(disp, _gloffset_FenceSync));
-}
-
-static inline void
-SET_FenceSync(struct _glapi_table *disp,
-              GLsync(GLAPIENTRYP fn) (GLenum, GLbitfield))
-{
-    SET_by_offset(disp, _gloffset_FenceSync, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetInteger64v) (GLenum, GLint64 *);
-
-#define CALL_GetInteger64v(disp, parameters) \
-    (* GET_GetInteger64v(disp)) parameters
-static inline _glptr_GetInteger64v
-GET_GetInteger64v(struct _glapi_table *disp)
-{
-    return (_glptr_GetInteger64v) (GET_by_offset
-                                   (disp, _gloffset_GetInteger64v));
-}
-
-static inline void
-SET_GetInteger64v(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint64 *))
-{
-    SET_by_offset(disp, _gloffset_GetInteger64v, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetSynciv) (GLsync, GLenum, GLsizei, GLsizei *,
-                                             GLint *);
-#define CALL_GetSynciv(disp, parameters) \
-    (* GET_GetSynciv(disp)) parameters
-static inline _glptr_GetSynciv
-GET_GetSynciv(struct _glapi_table *disp)
-{
-    return (_glptr_GetSynciv) (GET_by_offset(disp, _gloffset_GetSynciv));
-}
-
-static inline void
-SET_GetSynciv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLsync, GLenum, GLsizei, GLsizei *,
-                                     GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetSynciv, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsSync) (GLsync);
-
-#define CALL_IsSync(disp, parameters) \
-    (* GET_IsSync(disp)) parameters
-static inline _glptr_IsSync
-GET_IsSync(struct _glapi_table *disp)
-{
-    return (_glptr_IsSync) (GET_by_offset(disp, _gloffset_IsSync));
-}
-
-static inline void
-SET_IsSync(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLsync))
-{
-    SET_by_offset(disp, _gloffset_IsSync, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WaitSync) (GLsync, GLbitfield, GLuint64);
-
-#define CALL_WaitSync(disp, parameters) \
-    (* GET_WaitSync(disp)) parameters
-static inline _glptr_WaitSync
-GET_WaitSync(struct _glapi_table *disp)
-{
-    return (_glptr_WaitSync) (GET_by_offset(disp, _gloffset_WaitSync));
-}
-
-static inline void
-SET_WaitSync(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLsync, GLbitfield, GLuint64))
-{
-    SET_by_offset(disp, _gloffset_WaitSync, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawElementsBaseVertex) (GLenum, GLsizei,
-                                                          GLenum,
-                                                          const GLvoid *,
-                                                          GLint);
-#define CALL_DrawElementsBaseVertex(disp, parameters) \
-    (* GET_DrawElementsBaseVertex(disp)) parameters
-static inline _glptr_DrawElementsBaseVertex
-GET_DrawElementsBaseVertex(struct _glapi_table *disp)
-{
-    return (_glptr_DrawElementsBaseVertex) (GET_by_offset
-                                            (disp,
-                                             _gloffset_DrawElementsBaseVertex));
-}
-
-static inline void
-SET_DrawElementsBaseVertex(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum,
-                                                  const GLvoid *, GLint))
-{
-    SET_by_offset(disp, _gloffset_DrawElementsBaseVertex, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedBaseVertex) (GLenum,
-                                                                   GLsizei,
-                                                                   GLenum,
-                                                                   const GLvoid
-                                                                   *, GLsizei,
-                                                                   GLint);
-#define CALL_DrawElementsInstancedBaseVertex(disp, parameters) \
-    (* GET_DrawElementsInstancedBaseVertex(disp)) parameters
-static inline _glptr_DrawElementsInstancedBaseVertex
-GET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp)
-{
-    return (_glptr_DrawElementsInstancedBaseVertex) (GET_by_offset
-                                                     (disp,
-                                                      _gloffset_DrawElementsInstancedBaseVertex));
-}
-
-static inline void
-SET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp,
-                                    void (GLAPIENTRYP fn) (GLenum, GLsizei,
-                                                           GLenum,
-                                                           const GLvoid *,
-                                                           GLsizei, GLint))
-{
-    SET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertex, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawRangeElementsBaseVertex) (GLenum, GLuint,
-                                                               GLuint, GLsizei,
-                                                               GLenum,
-                                                               const GLvoid *,
-                                                               GLint);
-#define CALL_DrawRangeElementsBaseVertex(disp, parameters) \
-    (* GET_DrawRangeElementsBaseVertex(disp)) parameters
-static inline _glptr_DrawRangeElementsBaseVertex
-GET_DrawRangeElementsBaseVertex(struct _glapi_table *disp)
-{
-    return (_glptr_DrawRangeElementsBaseVertex) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_DrawRangeElementsBaseVertex));
-}
-
-static inline void
-SET_DrawRangeElementsBaseVertex(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint,
-                                                       GLsizei, GLenum,
-                                                       const GLvoid *, GLint))
-{
-    SET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiDrawElementsBaseVertex) (GLenum,
-                                                               const GLsizei *,
-                                                               GLenum,
-                                                               const GLvoid **,
-                                                               GLsizei,
-                                                               const GLint *);
-#define CALL_MultiDrawElementsBaseVertex(disp, parameters) \
-    (* GET_MultiDrawElementsBaseVertex(disp)) parameters
-static inline _glptr_MultiDrawElementsBaseVertex
-GET_MultiDrawElementsBaseVertex(struct _glapi_table *disp)
-{
-    return (_glptr_MultiDrawElementsBaseVertex) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_MultiDrawElementsBaseVertex));
-}
-
-static inline void
-SET_MultiDrawElementsBaseVertex(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLenum, const GLsizei *,
-                                                       GLenum, const GLvoid **,
-                                                       GLsizei, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_MultiDrawElementsBaseVertex, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BlendEquationSeparateiARB) (GLuint, GLenum,
-                                                             GLenum);
-#define CALL_BlendEquationSeparateiARB(disp, parameters) \
-    (* GET_BlendEquationSeparateiARB(disp)) parameters
-static inline _glptr_BlendEquationSeparateiARB
-GET_BlendEquationSeparateiARB(struct _glapi_table *disp)
-{
-    return (_glptr_BlendEquationSeparateiARB) (GET_by_offset
-                                               (disp,
-                                                _gloffset_BlendEquationSeparateiARB));
-}
-
-static inline void
-SET_BlendEquationSeparateiARB(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLuint, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendEquationSeparateiARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BlendEquationiARB) (GLuint, GLenum);
-
-#define CALL_BlendEquationiARB(disp, parameters) \
-    (* GET_BlendEquationiARB(disp)) parameters
-static inline _glptr_BlendEquationiARB
-GET_BlendEquationiARB(struct _glapi_table *disp)
-{
-    return (_glptr_BlendEquationiARB) (GET_by_offset
-                                       (disp, _gloffset_BlendEquationiARB));
-}
-
-static inline void
-SET_BlendEquationiARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendEquationiARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BlendFuncSeparateiARB) (GLuint, GLenum, GLenum,
-                                                         GLenum, GLenum);
-#define CALL_BlendFuncSeparateiARB(disp, parameters) \
-    (* GET_BlendFuncSeparateiARB(disp)) parameters
-static inline _glptr_BlendFuncSeparateiARB
-GET_BlendFuncSeparateiARB(struct _glapi_table *disp)
-{
-    return (_glptr_BlendFuncSeparateiARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_BlendFuncSeparateiARB));
-}
-
-static inline void
-SET_BlendFuncSeparateiARB(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint, GLenum, GLenum, GLenum,
-                                                 GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendFuncSeparateiARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BlendFunciARB) (GLuint, GLenum, GLenum);
-
-#define CALL_BlendFunciARB(disp, parameters) \
-    (* GET_BlendFunciARB(disp)) parameters
-static inline _glptr_BlendFunciARB
-GET_BlendFunciARB(struct _glapi_table *disp)
-{
-    return (_glptr_BlendFunciARB) (GET_by_offset
-                                   (disp, _gloffset_BlendFunciARB));
-}
-
-static inline void
-SET_BlendFunciARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLuint, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendFunciARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindSampler) (GLuint, GLuint);
-
-#define CALL_BindSampler(disp, parameters) \
-    (* GET_BindSampler(disp)) parameters
-static inline _glptr_BindSampler
-GET_BindSampler(struct _glapi_table *disp)
-{
-    return (_glptr_BindSampler) (GET_by_offset(disp, _gloffset_BindSampler));
-}
-
-static inline void
-SET_BindSampler(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindSampler, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteSamplers) (GLsizei, const GLuint *);
-
-#define CALL_DeleteSamplers(disp, parameters) \
-    (* GET_DeleteSamplers(disp)) parameters
-static inline _glptr_DeleteSamplers
-GET_DeleteSamplers(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteSamplers) (GET_by_offset
-                                    (disp, _gloffset_DeleteSamplers));
-}
-
-static inline void
-SET_DeleteSamplers(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteSamplers, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenSamplers) (GLsizei, GLuint *);
-
-#define CALL_GenSamplers(disp, parameters) \
-    (* GET_GenSamplers(disp)) parameters
-static inline _glptr_GenSamplers
-GET_GenSamplers(struct _glapi_table *disp)
-{
-    return (_glptr_GenSamplers) (GET_by_offset(disp, _gloffset_GenSamplers));
-}
-
-static inline void
-SET_GenSamplers(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenSamplers, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetSamplerParameterIiv) (GLuint, GLenum,
-                                                          GLint *);
-#define CALL_GetSamplerParameterIiv(disp, parameters) \
-    (* GET_GetSamplerParameterIiv(disp)) parameters
-static inline _glptr_GetSamplerParameterIiv
-GET_GetSamplerParameterIiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetSamplerParameterIiv) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetSamplerParameterIiv));
-}
-
-static inline void
-SET_GetSamplerParameterIiv(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetSamplerParameterIiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetSamplerParameterIuiv) (GLuint, GLenum,
-                                                           GLuint *);
-#define CALL_GetSamplerParameterIuiv(disp, parameters) \
-    (* GET_GetSamplerParameterIuiv(disp)) parameters
-static inline _glptr_GetSamplerParameterIuiv
-GET_GetSamplerParameterIuiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetSamplerParameterIuiv) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetSamplerParameterIuiv));
-}
-
-static inline void
-SET_GetSamplerParameterIuiv(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLuint, GLenum, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetSamplerParameterIuiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetSamplerParameterfv) (GLuint, GLenum,
-                                                         GLfloat *);
-#define CALL_GetSamplerParameterfv(disp, parameters) \
-    (* GET_GetSamplerParameterfv(disp)) parameters
-static inline _glptr_GetSamplerParameterfv
-GET_GetSamplerParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetSamplerParameterfv) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetSamplerParameterfv));
-}
-
-static inline void
-SET_GetSamplerParameterfv(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetSamplerParameterfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetSamplerParameteriv) (GLuint, GLenum,
-                                                         GLint *);
-#define CALL_GetSamplerParameteriv(disp, parameters) \
-    (* GET_GetSamplerParameteriv(disp)) parameters
-static inline _glptr_GetSamplerParameteriv
-GET_GetSamplerParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetSamplerParameteriv) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetSamplerParameteriv));
-}
-
-static inline void
-SET_GetSamplerParameteriv(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetSamplerParameteriv, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsSampler) (GLuint);
-
-#define CALL_IsSampler(disp, parameters) \
-    (* GET_IsSampler(disp)) parameters
-static inline _glptr_IsSampler
-GET_IsSampler(struct _glapi_table *disp)
-{
-    return (_glptr_IsSampler) (GET_by_offset(disp, _gloffset_IsSampler));
-}
-
-static inline void
-SET_IsSampler(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsSampler, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SamplerParameterIiv) (GLuint, GLenum,
-                                                       const GLint *);
-#define CALL_SamplerParameterIiv(disp, parameters) \
-    (* GET_SamplerParameterIiv(disp)) parameters
-static inline _glptr_SamplerParameterIiv
-GET_SamplerParameterIiv(struct _glapi_table *disp)
-{
-    return (_glptr_SamplerParameterIiv) (GET_by_offset
-                                         (disp, _gloffset_SamplerParameterIiv));
-}
-
-static inline void
-SET_SamplerParameterIiv(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_SamplerParameterIiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SamplerParameterIuiv) (GLuint, GLenum,
-                                                        const GLuint *);
-#define CALL_SamplerParameterIuiv(disp, parameters) \
-    (* GET_SamplerParameterIuiv(disp)) parameters
-static inline _glptr_SamplerParameterIuiv
-GET_SamplerParameterIuiv(struct _glapi_table *disp)
-{
-    return (_glptr_SamplerParameterIuiv) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SamplerParameterIuiv));
-}
-
-static inline void
-SET_SamplerParameterIuiv(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_SamplerParameterIuiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SamplerParameterf) (GLuint, GLenum, GLfloat);
-
-#define CALL_SamplerParameterf(disp, parameters) \
-    (* GET_SamplerParameterf(disp)) parameters
-static inline _glptr_SamplerParameterf
-GET_SamplerParameterf(struct _glapi_table *disp)
-{
-    return (_glptr_SamplerParameterf) (GET_by_offset
-                                       (disp, _gloffset_SamplerParameterf));
-}
-
-static inline void
-SET_SamplerParameterf(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_SamplerParameterf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SamplerParameterfv) (GLuint, GLenum,
-                                                      const GLfloat *);
-#define CALL_SamplerParameterfv(disp, parameters) \
-    (* GET_SamplerParameterfv(disp)) parameters
-static inline _glptr_SamplerParameterfv
-GET_SamplerParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_SamplerParameterfv) (GET_by_offset
-                                        (disp, _gloffset_SamplerParameterfv));
-}
-
-static inline void
-SET_SamplerParameterfv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_SamplerParameterfv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SamplerParameteri) (GLuint, GLenum, GLint);
-
-#define CALL_SamplerParameteri(disp, parameters) \
-    (* GET_SamplerParameteri(disp)) parameters
-static inline _glptr_SamplerParameteri
-GET_SamplerParameteri(struct _glapi_table *disp)
-{
-    return (_glptr_SamplerParameteri) (GET_by_offset
-                                       (disp, _gloffset_SamplerParameteri));
-}
-
-static inline void
-SET_SamplerParameteri(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_SamplerParameteri, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SamplerParameteriv) (GLuint, GLenum,
-                                                      const GLint *);
-#define CALL_SamplerParameteriv(disp, parameters) \
-    (* GET_SamplerParameteriv(disp)) parameters
-static inline _glptr_SamplerParameteriv
-GET_SamplerParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_SamplerParameteriv) (GET_by_offset
-                                        (disp, _gloffset_SamplerParameteriv));
-}
-
-static inline void
-SET_SamplerParameteriv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_SamplerParameteriv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorP3ui) (GLenum, GLuint);
-
-#define CALL_ColorP3ui(disp, parameters) \
-    (* GET_ColorP3ui(disp)) parameters
-static inline _glptr_ColorP3ui
-GET_ColorP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_ColorP3ui) (GET_by_offset(disp, _gloffset_ColorP3ui));
-}
-
-static inline void
-SET_ColorP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_ColorP3ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorP3uiv) (GLenum, const GLuint *);
-
-#define CALL_ColorP3uiv(disp, parameters) \
-    (* GET_ColorP3uiv(disp)) parameters
-static inline _glptr_ColorP3uiv
-GET_ColorP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_ColorP3uiv) (GET_by_offset(disp, _gloffset_ColorP3uiv));
-}
-
-static inline void
-SET_ColorP3uiv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_ColorP3uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorP4ui) (GLenum, GLuint);
-
-#define CALL_ColorP4ui(disp, parameters) \
-    (* GET_ColorP4ui(disp)) parameters
-static inline _glptr_ColorP4ui
-GET_ColorP4ui(struct _glapi_table *disp)
-{
-    return (_glptr_ColorP4ui) (GET_by_offset(disp, _gloffset_ColorP4ui));
-}
-
-static inline void
-SET_ColorP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_ColorP4ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorP4uiv) (GLenum, const GLuint *);
-
-#define CALL_ColorP4uiv(disp, parameters) \
-    (* GET_ColorP4uiv(disp)) parameters
-static inline _glptr_ColorP4uiv
-GET_ColorP4uiv(struct _glapi_table *disp)
-{
-    return (_glptr_ColorP4uiv) (GET_by_offset(disp, _gloffset_ColorP4uiv));
-}
-
-static inline void
-SET_ColorP4uiv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_ColorP4uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoordP1ui) (GLenum, GLenum, GLuint);
-
-#define CALL_MultiTexCoordP1ui(disp, parameters) \
-    (* GET_MultiTexCoordP1ui(disp)) parameters
-static inline _glptr_MultiTexCoordP1ui
-GET_MultiTexCoordP1ui(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP1ui) (GET_by_offset
-                                       (disp, _gloffset_MultiTexCoordP1ui));
-}
-
-static inline void
-SET_MultiTexCoordP1ui(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP1ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoordP1uiv) (GLenum, GLenum,
-                                                      const GLuint *);
-#define CALL_MultiTexCoordP1uiv(disp, parameters) \
-    (* GET_MultiTexCoordP1uiv(disp)) parameters
-static inline _glptr_MultiTexCoordP1uiv
-GET_MultiTexCoordP1uiv(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP1uiv) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoordP1uiv));
-}
-
-static inline void
-SET_MultiTexCoordP1uiv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP1uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoordP2ui) (GLenum, GLenum, GLuint);
-
-#define CALL_MultiTexCoordP2ui(disp, parameters) \
-    (* GET_MultiTexCoordP2ui(disp)) parameters
-static inline _glptr_MultiTexCoordP2ui
-GET_MultiTexCoordP2ui(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP2ui) (GET_by_offset
-                                       (disp, _gloffset_MultiTexCoordP2ui));
-}
-
-static inline void
-SET_MultiTexCoordP2ui(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP2ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoordP2uiv) (GLenum, GLenum,
-                                                      const GLuint *);
-#define CALL_MultiTexCoordP2uiv(disp, parameters) \
-    (* GET_MultiTexCoordP2uiv(disp)) parameters
-static inline _glptr_MultiTexCoordP2uiv
-GET_MultiTexCoordP2uiv(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP2uiv) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoordP2uiv));
-}
-
-static inline void
-SET_MultiTexCoordP2uiv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP2uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoordP3ui) (GLenum, GLenum, GLuint);
-
-#define CALL_MultiTexCoordP3ui(disp, parameters) \
-    (* GET_MultiTexCoordP3ui(disp)) parameters
-static inline _glptr_MultiTexCoordP3ui
-GET_MultiTexCoordP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP3ui) (GET_by_offset
-                                       (disp, _gloffset_MultiTexCoordP3ui));
-}
-
-static inline void
-SET_MultiTexCoordP3ui(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP3ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoordP3uiv) (GLenum, GLenum,
-                                                      const GLuint *);
-#define CALL_MultiTexCoordP3uiv(disp, parameters) \
-    (* GET_MultiTexCoordP3uiv(disp)) parameters
-static inline _glptr_MultiTexCoordP3uiv
-GET_MultiTexCoordP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP3uiv) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoordP3uiv));
-}
-
-static inline void
-SET_MultiTexCoordP3uiv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP3uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoordP4ui) (GLenum, GLenum, GLuint);
-
-#define CALL_MultiTexCoordP4ui(disp, parameters) \
-    (* GET_MultiTexCoordP4ui(disp)) parameters
-static inline _glptr_MultiTexCoordP4ui
-GET_MultiTexCoordP4ui(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP4ui) (GET_by_offset
-                                       (disp, _gloffset_MultiTexCoordP4ui));
-}
-
-static inline void
-SET_MultiTexCoordP4ui(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP4ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoordP4uiv) (GLenum, GLenum,
-                                                      const GLuint *);
-#define CALL_MultiTexCoordP4uiv(disp, parameters) \
-    (* GET_MultiTexCoordP4uiv(disp)) parameters
-static inline _glptr_MultiTexCoordP4uiv
-GET_MultiTexCoordP4uiv(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP4uiv) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoordP4uiv));
-}
-
-static inline void
-SET_MultiTexCoordP4uiv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP4uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_NormalP3ui) (GLenum, GLuint);
-
-#define CALL_NormalP3ui(disp, parameters) \
-    (* GET_NormalP3ui(disp)) parameters
-static inline _glptr_NormalP3ui
-GET_NormalP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_NormalP3ui) (GET_by_offset(disp, _gloffset_NormalP3ui));
-}
-
-static inline void
-SET_NormalP3ui(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_NormalP3ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_NormalP3uiv) (GLenum, const GLuint *);
-
-#define CALL_NormalP3uiv(disp, parameters) \
-    (* GET_NormalP3uiv(disp)) parameters
-static inline _glptr_NormalP3uiv
-GET_NormalP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_NormalP3uiv) (GET_by_offset(disp, _gloffset_NormalP3uiv));
-}
-
-static inline void
-SET_NormalP3uiv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_NormalP3uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColorP3ui) (GLenum, GLuint);
-
-#define CALL_SecondaryColorP3ui(disp, parameters) \
-    (* GET_SecondaryColorP3ui(disp)) parameters
-static inline _glptr_SecondaryColorP3ui
-GET_SecondaryColorP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColorP3ui) (GET_by_offset
-                                        (disp, _gloffset_SecondaryColorP3ui));
-}
-
-static inline void
-SET_SecondaryColorP3ui(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColorP3ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColorP3uiv) (GLenum, const GLuint *);
-
-#define CALL_SecondaryColorP3uiv(disp, parameters) \
-    (* GET_SecondaryColorP3uiv(disp)) parameters
-static inline _glptr_SecondaryColorP3uiv
-GET_SecondaryColorP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColorP3uiv) (GET_by_offset
-                                         (disp, _gloffset_SecondaryColorP3uiv));
-}
-
-static inline void
-SET_SecondaryColorP3uiv(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColorP3uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoordP1ui) (GLenum, GLuint);
-
-#define CALL_TexCoordP1ui(disp, parameters) \
-    (* GET_TexCoordP1ui(disp)) parameters
-static inline _glptr_TexCoordP1ui
-GET_TexCoordP1ui(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP1ui) (GET_by_offset(disp, _gloffset_TexCoordP1ui));
-}
-
-static inline void
-SET_TexCoordP1ui(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP1ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoordP1uiv) (GLenum, const GLuint *);
-
-#define CALL_TexCoordP1uiv(disp, parameters) \
-    (* GET_TexCoordP1uiv(disp)) parameters
-static inline _glptr_TexCoordP1uiv
-GET_TexCoordP1uiv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP1uiv) (GET_by_offset
-                                   (disp, _gloffset_TexCoordP1uiv));
-}
-
-static inline void
-SET_TexCoordP1uiv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP1uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoordP2ui) (GLenum, GLuint);
-
-#define CALL_TexCoordP2ui(disp, parameters) \
-    (* GET_TexCoordP2ui(disp)) parameters
-static inline _glptr_TexCoordP2ui
-GET_TexCoordP2ui(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP2ui) (GET_by_offset(disp, _gloffset_TexCoordP2ui));
-}
-
-static inline void
-SET_TexCoordP2ui(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP2ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoordP2uiv) (GLenum, const GLuint *);
-
-#define CALL_TexCoordP2uiv(disp, parameters) \
-    (* GET_TexCoordP2uiv(disp)) parameters
-static inline _glptr_TexCoordP2uiv
-GET_TexCoordP2uiv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP2uiv) (GET_by_offset
-                                   (disp, _gloffset_TexCoordP2uiv));
-}
-
-static inline void
-SET_TexCoordP2uiv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP2uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoordP3ui) (GLenum, GLuint);
-
-#define CALL_TexCoordP3ui(disp, parameters) \
-    (* GET_TexCoordP3ui(disp)) parameters
-static inline _glptr_TexCoordP3ui
-GET_TexCoordP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP3ui) (GET_by_offset(disp, _gloffset_TexCoordP3ui));
-}
-
-static inline void
-SET_TexCoordP3ui(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP3ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoordP3uiv) (GLenum, const GLuint *);
-
-#define CALL_TexCoordP3uiv(disp, parameters) \
-    (* GET_TexCoordP3uiv(disp)) parameters
-static inline _glptr_TexCoordP3uiv
-GET_TexCoordP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP3uiv) (GET_by_offset
-                                   (disp, _gloffset_TexCoordP3uiv));
-}
-
-static inline void
-SET_TexCoordP3uiv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP3uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoordP4ui) (GLenum, GLuint);
-
-#define CALL_TexCoordP4ui(disp, parameters) \
-    (* GET_TexCoordP4ui(disp)) parameters
-static inline _glptr_TexCoordP4ui
-GET_TexCoordP4ui(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP4ui) (GET_by_offset(disp, _gloffset_TexCoordP4ui));
-}
-
-static inline void
-SET_TexCoordP4ui(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP4ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoordP4uiv) (GLenum, const GLuint *);
-
-#define CALL_TexCoordP4uiv(disp, parameters) \
-    (* GET_TexCoordP4uiv(disp)) parameters
-static inline _glptr_TexCoordP4uiv
-GET_TexCoordP4uiv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP4uiv) (GET_by_offset
-                                   (disp, _gloffset_TexCoordP4uiv));
-}
-
-static inline void
-SET_TexCoordP4uiv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP4uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribP1ui) (GLuint, GLenum, GLboolean,
-                                                    GLuint);
-#define CALL_VertexAttribP1ui(disp, parameters) \
-    (* GET_VertexAttribP1ui(disp)) parameters
-static inline _glptr_VertexAttribP1ui
-GET_VertexAttribP1ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP1ui) (GET_by_offset
-                                      (disp, _gloffset_VertexAttribP1ui));
-}
-
-static inline void
-SET_VertexAttribP1ui(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP1ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribP1uiv) (GLuint, GLenum, GLboolean,
-                                                     const GLuint *);
-#define CALL_VertexAttribP1uiv(disp, parameters) \
-    (* GET_VertexAttribP1uiv(disp)) parameters
-static inline _glptr_VertexAttribP1uiv
-GET_VertexAttribP1uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP1uiv) (GET_by_offset
-                                       (disp, _gloffset_VertexAttribP1uiv));
-}
-
-static inline void
-SET_VertexAttribP1uiv(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean,
-                                             const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP1uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribP2ui) (GLuint, GLenum, GLboolean,
-                                                    GLuint);
-#define CALL_VertexAttribP2ui(disp, parameters) \
-    (* GET_VertexAttribP2ui(disp)) parameters
-static inline _glptr_VertexAttribP2ui
-GET_VertexAttribP2ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP2ui) (GET_by_offset
-                                      (disp, _gloffset_VertexAttribP2ui));
-}
-
-static inline void
-SET_VertexAttribP2ui(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP2ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribP2uiv) (GLuint, GLenum, GLboolean,
-                                                     const GLuint *);
-#define CALL_VertexAttribP2uiv(disp, parameters) \
-    (* GET_VertexAttribP2uiv(disp)) parameters
-static inline _glptr_VertexAttribP2uiv
-GET_VertexAttribP2uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP2uiv) (GET_by_offset
-                                       (disp, _gloffset_VertexAttribP2uiv));
-}
-
-static inline void
-SET_VertexAttribP2uiv(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean,
-                                             const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP2uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribP3ui) (GLuint, GLenum, GLboolean,
-                                                    GLuint);
-#define CALL_VertexAttribP3ui(disp, parameters) \
-    (* GET_VertexAttribP3ui(disp)) parameters
-static inline _glptr_VertexAttribP3ui
-GET_VertexAttribP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP3ui) (GET_by_offset
-                                      (disp, _gloffset_VertexAttribP3ui));
-}
-
-static inline void
-SET_VertexAttribP3ui(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP3ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribP3uiv) (GLuint, GLenum, GLboolean,
-                                                     const GLuint *);
-#define CALL_VertexAttribP3uiv(disp, parameters) \
-    (* GET_VertexAttribP3uiv(disp)) parameters
-static inline _glptr_VertexAttribP3uiv
-GET_VertexAttribP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP3uiv) (GET_by_offset
-                                       (disp, _gloffset_VertexAttribP3uiv));
-}
-
-static inline void
-SET_VertexAttribP3uiv(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean,
-                                             const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP3uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribP4ui) (GLuint, GLenum, GLboolean,
-                                                    GLuint);
-#define CALL_VertexAttribP4ui(disp, parameters) \
-    (* GET_VertexAttribP4ui(disp)) parameters
-static inline _glptr_VertexAttribP4ui
-GET_VertexAttribP4ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP4ui) (GET_by_offset
-                                      (disp, _gloffset_VertexAttribP4ui));
-}
-
-static inline void
-SET_VertexAttribP4ui(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP4ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribP4uiv) (GLuint, GLenum, GLboolean,
-                                                     const GLuint *);
-#define CALL_VertexAttribP4uiv(disp, parameters) \
-    (* GET_VertexAttribP4uiv(disp)) parameters
-static inline _glptr_VertexAttribP4uiv
-GET_VertexAttribP4uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP4uiv) (GET_by_offset
-                                       (disp, _gloffset_VertexAttribP4uiv));
-}
-
-static inline void
-SET_VertexAttribP4uiv(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean,
-                                             const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP4uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexP2ui) (GLenum, GLuint);
-
-#define CALL_VertexP2ui(disp, parameters) \
-    (* GET_VertexP2ui(disp)) parameters
-static inline _glptr_VertexP2ui
-GET_VertexP2ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexP2ui) (GET_by_offset(disp, _gloffset_VertexP2ui));
-}
-
-static inline void
-SET_VertexP2ui(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexP2ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexP2uiv) (GLenum, const GLuint *);
-
-#define CALL_VertexP2uiv(disp, parameters) \
-    (* GET_VertexP2uiv(disp)) parameters
-static inline _glptr_VertexP2uiv
-GET_VertexP2uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexP2uiv) (GET_by_offset(disp, _gloffset_VertexP2uiv));
-}
-
-static inline void
-SET_VertexP2uiv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexP2uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexP3ui) (GLenum, GLuint);
-
-#define CALL_VertexP3ui(disp, parameters) \
-    (* GET_VertexP3ui(disp)) parameters
-static inline _glptr_VertexP3ui
-GET_VertexP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexP3ui) (GET_by_offset(disp, _gloffset_VertexP3ui));
-}
-
-static inline void
-SET_VertexP3ui(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexP3ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexP3uiv) (GLenum, const GLuint *);
-
-#define CALL_VertexP3uiv(disp, parameters) \
-    (* GET_VertexP3uiv(disp)) parameters
-static inline _glptr_VertexP3uiv
-GET_VertexP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexP3uiv) (GET_by_offset(disp, _gloffset_VertexP3uiv));
-}
-
-static inline void
-SET_VertexP3uiv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexP3uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexP4ui) (GLenum, GLuint);
-
-#define CALL_VertexP4ui(disp, parameters) \
-    (* GET_VertexP4ui(disp)) parameters
-static inline _glptr_VertexP4ui
-GET_VertexP4ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexP4ui) (GET_by_offset(disp, _gloffset_VertexP4ui));
-}
-
-static inline void
-SET_VertexP4ui(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexP4ui, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexP4uiv) (GLenum, const GLuint *);
-
-#define CALL_VertexP4uiv(disp, parameters) \
-    (* GET_VertexP4uiv(disp)) parameters
-static inline _glptr_VertexP4uiv
-GET_VertexP4uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexP4uiv) (GET_by_offset(disp, _gloffset_VertexP4uiv));
-}
-
-static inline void
-SET_VertexP4uiv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexP4uiv, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindTransformFeedback) (GLenum, GLuint);
-
-#define CALL_BindTransformFeedback(disp, parameters) \
-    (* GET_BindTransformFeedback(disp)) parameters
-static inline _glptr_BindTransformFeedback
-GET_BindTransformFeedback(struct _glapi_table *disp)
-{
-    return (_glptr_BindTransformFeedback) (GET_by_offset
-                                           (disp,
-                                            _gloffset_BindTransformFeedback));
-}
-
-static inline void
-SET_BindTransformFeedback(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindTransformFeedback, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteTransformFeedbacks) (GLsizei,
-                                                            const GLuint *);
-#define CALL_DeleteTransformFeedbacks(disp, parameters) \
-    (* GET_DeleteTransformFeedbacks(disp)) parameters
-static inline _glptr_DeleteTransformFeedbacks
-GET_DeleteTransformFeedbacks(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteTransformFeedbacks) (GET_by_offset
-                                              (disp,
-                                               _gloffset_DeleteTransformFeedbacks));
-}
-
-static inline void
-SET_DeleteTransformFeedbacks(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteTransformFeedbacks, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawTransformFeedback) (GLenum, GLuint);
-
-#define CALL_DrawTransformFeedback(disp, parameters) \
-    (* GET_DrawTransformFeedback(disp)) parameters
-static inline _glptr_DrawTransformFeedback
-GET_DrawTransformFeedback(struct _glapi_table *disp)
-{
-    return (_glptr_DrawTransformFeedback) (GET_by_offset
-                                           (disp,
-                                            _gloffset_DrawTransformFeedback));
-}
-
-static inline void
-SET_DrawTransformFeedback(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_DrawTransformFeedback, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenTransformFeedbacks) (GLsizei, GLuint *);
-
-#define CALL_GenTransformFeedbacks(disp, parameters) \
-    (* GET_GenTransformFeedbacks(disp)) parameters
-static inline _glptr_GenTransformFeedbacks
-GET_GenTransformFeedbacks(struct _glapi_table *disp)
-{
-    return (_glptr_GenTransformFeedbacks) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GenTransformFeedbacks));
-}
-
-static inline void
-SET_GenTransformFeedbacks(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenTransformFeedbacks, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsTransformFeedback) (GLuint);
-
-#define CALL_IsTransformFeedback(disp, parameters) \
-    (* GET_IsTransformFeedback(disp)) parameters
-static inline _glptr_IsTransformFeedback
-GET_IsTransformFeedback(struct _glapi_table *disp)
-{
-    return (_glptr_IsTransformFeedback) (GET_by_offset
-                                         (disp, _gloffset_IsTransformFeedback));
-}
-
-static inline void
-SET_IsTransformFeedback(struct _glapi_table *disp,
-                        GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsTransformFeedback, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PauseTransformFeedback) (void);
-
-#define CALL_PauseTransformFeedback(disp, parameters) \
-    (* GET_PauseTransformFeedback(disp)) parameters
-static inline _glptr_PauseTransformFeedback
-GET_PauseTransformFeedback(struct _glapi_table *disp)
-{
-    return (_glptr_PauseTransformFeedback) (GET_by_offset
-                                            (disp,
-                                             _gloffset_PauseTransformFeedback));
-}
-
-static inline void
-SET_PauseTransformFeedback(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PauseTransformFeedback, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ResumeTransformFeedback) (void);
-
-#define CALL_ResumeTransformFeedback(disp, parameters) \
-    (* GET_ResumeTransformFeedback(disp)) parameters
-static inline _glptr_ResumeTransformFeedback
-GET_ResumeTransformFeedback(struct _glapi_table *disp)
-{
-    return (_glptr_ResumeTransformFeedback) (GET_by_offset
-                                             (disp,
-                                              _gloffset_ResumeTransformFeedback));
-}
-
-static inline void
-SET_ResumeTransformFeedback(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_ResumeTransformFeedback, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClearDepthf) (GLclampf);
-
-#define CALL_ClearDepthf(disp, parameters) \
-    (* GET_ClearDepthf(disp)) parameters
-static inline _glptr_ClearDepthf
-GET_ClearDepthf(struct _glapi_table *disp)
-{
-    return (_glptr_ClearDepthf) (GET_by_offset(disp, _gloffset_ClearDepthf));
-}
-
-static inline void
-SET_ClearDepthf(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLclampf))
-{
-    SET_by_offset(disp, _gloffset_ClearDepthf, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DepthRangef) (GLclampf, GLclampf);
-
-#define CALL_DepthRangef(disp, parameters) \
-    (* GET_DepthRangef(disp)) parameters
-static inline _glptr_DepthRangef
-GET_DepthRangef(struct _glapi_table *disp)
-{
-    return (_glptr_DepthRangef) (GET_by_offset(disp, _gloffset_DepthRangef));
-}
-
-static inline void
-SET_DepthRangef(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLclampf, GLclampf))
-{
-    SET_by_offset(disp, _gloffset_DepthRangef, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetShaderPrecisionFormat) (GLenum, GLenum,
-                                                            GLint *, GLint *);
-#define CALL_GetShaderPrecisionFormat(disp, parameters) \
-    (* GET_GetShaderPrecisionFormat(disp)) parameters
-static inline _glptr_GetShaderPrecisionFormat
-GET_GetShaderPrecisionFormat(struct _glapi_table *disp)
-{
-    return (_glptr_GetShaderPrecisionFormat) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetShaderPrecisionFormat));
-}
-
-static inline void
-SET_GetShaderPrecisionFormat(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *,
-                                                    GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetShaderPrecisionFormat, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ReleaseShaderCompiler) (void);
-
-#define CALL_ReleaseShaderCompiler(disp, parameters) \
-    (* GET_ReleaseShaderCompiler(disp)) parameters
-static inline _glptr_ReleaseShaderCompiler
-GET_ReleaseShaderCompiler(struct _glapi_table *disp)
-{
-    return (_glptr_ReleaseShaderCompiler) (GET_by_offset
-                                           (disp,
-                                            _gloffset_ReleaseShaderCompiler));
-}
-
-static inline void
-SET_ReleaseShaderCompiler(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_ReleaseShaderCompiler, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ShaderBinary) (GLsizei, const GLuint *, GLenum,
-                                                const GLvoid *, GLsizei);
-#define CALL_ShaderBinary(disp, parameters) \
-    (* GET_ShaderBinary(disp)) parameters
-static inline _glptr_ShaderBinary
-GET_ShaderBinary(struct _glapi_table *disp)
-{
-    return (_glptr_ShaderBinary) (GET_by_offset(disp, _gloffset_ShaderBinary));
-}
-
-static inline void
-SET_ShaderBinary(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLsizei, const GLuint *, GLenum,
-                                        const GLvoid *, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_ShaderBinary, fn);
-}
-
-typedef GLenum(GLAPIENTRYP _glptr_GetGraphicsResetStatusARB) (void);
-
-#define CALL_GetGraphicsResetStatusARB(disp, parameters) \
-    (* GET_GetGraphicsResetStatusARB(disp)) parameters
-static inline _glptr_GetGraphicsResetStatusARB
-GET_GetGraphicsResetStatusARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetGraphicsResetStatusARB) (GET_by_offset
-                                               (disp,
-                                                _gloffset_GetGraphicsResetStatusARB));
-}
-
-static inline void
-SET_GetGraphicsResetStatusARB(struct _glapi_table *disp,
-                              GLenum(GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_GetGraphicsResetStatusARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnColorTableARB) (GLenum, GLenum, GLenum,
-                                                     GLsizei, GLvoid *);
-#define CALL_GetnColorTableARB(disp, parameters) \
-    (* GET_GetnColorTableARB(disp)) parameters
-static inline _glptr_GetnColorTableARB
-GET_GetnColorTableARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnColorTableARB) (GET_by_offset
-                                       (disp, _gloffset_GetnColorTableARB));
-}
-
-static inline void
-SET_GetnColorTableARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLsizei,
-                                             GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnColorTableARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnCompressedTexImageARB) (GLenum, GLint,
-                                                             GLsizei, GLvoid *);
-#define CALL_GetnCompressedTexImageARB(disp, parameters) \
-    (* GET_GetnCompressedTexImageARB(disp)) parameters
-static inline _glptr_GetnCompressedTexImageARB
-GET_GetnCompressedTexImageARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnCompressedTexImageARB) (GET_by_offset
-                                               (disp,
-                                                _gloffset_GetnCompressedTexImageARB));
-}
-
-static inline void
-SET_GetnCompressedTexImageARB(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLint, GLsizei,
-                                                     GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnCompressedTexImageARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnConvolutionFilterARB) (GLenum, GLenum,
-                                                            GLenum, GLsizei,
-                                                            GLvoid *);
-#define CALL_GetnConvolutionFilterARB(disp, parameters) \
-    (* GET_GetnConvolutionFilterARB(disp)) parameters
-static inline _glptr_GetnConvolutionFilterARB
-GET_GetnConvolutionFilterARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnConvolutionFilterARB) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetnConvolutionFilterARB));
-}
-
-static inline void
-SET_GetnConvolutionFilterARB(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                    GLsizei, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnConvolutionFilterARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnHistogramARB) (GLenum, GLboolean, GLenum,
-                                                    GLenum, GLsizei, GLvoid *);
-#define CALL_GetnHistogramARB(disp, parameters) \
-    (* GET_GetnHistogramARB(disp)) parameters
-static inline _glptr_GetnHistogramARB
-GET_GetnHistogramARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnHistogramARB) (GET_by_offset
-                                      (disp, _gloffset_GetnHistogramARB));
-}
-
-static inline void
-SET_GetnHistogramARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLboolean, GLenum, GLenum,
-                                            GLsizei, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnHistogramARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnMapdvARB) (GLenum, GLenum, GLsizei,
-                                                GLdouble *);
-#define CALL_GetnMapdvARB(disp, parameters) \
-    (* GET_GetnMapdvARB(disp)) parameters
-static inline _glptr_GetnMapdvARB
-GET_GetnMapdvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnMapdvARB) (GET_by_offset(disp, _gloffset_GetnMapdvARB));
-}
-
-static inline void
-SET_GetnMapdvARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetnMapdvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnMapfvARB) (GLenum, GLenum, GLsizei,
-                                                GLfloat *);
-#define CALL_GetnMapfvARB(disp, parameters) \
-    (* GET_GetnMapfvARB(disp)) parameters
-static inline _glptr_GetnMapfvARB
-GET_GetnMapfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnMapfvARB) (GET_by_offset(disp, _gloffset_GetnMapfvARB));
-}
-
-static inline void
-SET_GetnMapfvARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetnMapfvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnMapivARB) (GLenum, GLenum, GLsizei,
-                                                GLint *);
-#define CALL_GetnMapivARB(disp, parameters) \
-    (* GET_GetnMapivARB(disp)) parameters
-static inline _glptr_GetnMapivARB
-GET_GetnMapivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnMapivARB) (GET_by_offset(disp, _gloffset_GetnMapivARB));
-}
-
-static inline void
-SET_GetnMapivARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetnMapivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnMinmaxARB) (GLenum, GLboolean, GLenum,
-                                                 GLenum, GLsizei, GLvoid *);
-#define CALL_GetnMinmaxARB(disp, parameters) \
-    (* GET_GetnMinmaxARB(disp)) parameters
-static inline _glptr_GetnMinmaxARB
-GET_GetnMinmaxARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnMinmaxARB) (GET_by_offset
-                                   (disp, _gloffset_GetnMinmaxARB));
-}
-
-static inline void
-SET_GetnMinmaxARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLboolean, GLenum, GLenum,
-                                         GLsizei, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnMinmaxARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnPixelMapfvARB) (GLenum, GLsizei,
-                                                     GLfloat *);
-#define CALL_GetnPixelMapfvARB(disp, parameters) \
-    (* GET_GetnPixelMapfvARB(disp)) parameters
-static inline _glptr_GetnPixelMapfvARB
-GET_GetnPixelMapfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnPixelMapfvARB) (GET_by_offset
-                                       (disp, _gloffset_GetnPixelMapfvARB));
-}
-
-static inline void
-SET_GetnPixelMapfvARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLsizei, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetnPixelMapfvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnPixelMapuivARB) (GLenum, GLsizei,
-                                                      GLuint *);
-#define CALL_GetnPixelMapuivARB(disp, parameters) \
-    (* GET_GetnPixelMapuivARB(disp)) parameters
-static inline _glptr_GetnPixelMapuivARB
-GET_GetnPixelMapuivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnPixelMapuivARB) (GET_by_offset
-                                        (disp, _gloffset_GetnPixelMapuivARB));
-}
-
-static inline void
-SET_GetnPixelMapuivARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetnPixelMapuivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnPixelMapusvARB) (GLenum, GLsizei,
-                                                      GLushort *);
-#define CALL_GetnPixelMapusvARB(disp, parameters) \
-    (* GET_GetnPixelMapusvARB(disp)) parameters
-static inline _glptr_GetnPixelMapusvARB
-GET_GetnPixelMapusvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnPixelMapusvARB) (GET_by_offset
-                                        (disp, _gloffset_GetnPixelMapusvARB));
-}
-
-static inline void
-SET_GetnPixelMapusvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLsizei, GLushort *))
-{
-    SET_by_offset(disp, _gloffset_GetnPixelMapusvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnPolygonStippleARB) (GLsizei, GLubyte *);
-
-#define CALL_GetnPolygonStippleARB(disp, parameters) \
-    (* GET_GetnPolygonStippleARB(disp)) parameters
-static inline _glptr_GetnPolygonStippleARB
-GET_GetnPolygonStippleARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnPolygonStippleARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetnPolygonStippleARB));
-}
-
-static inline void
-SET_GetnPolygonStippleARB(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLsizei, GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_GetnPolygonStippleARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnSeparableFilterARB) (GLenum, GLenum,
-                                                          GLenum, GLsizei,
-                                                          GLvoid *, GLsizei,
-                                                          GLvoid *, GLvoid *);
-#define CALL_GetnSeparableFilterARB(disp, parameters) \
-    (* GET_GetnSeparableFilterARB(disp)) parameters
-static inline _glptr_GetnSeparableFilterARB
-GET_GetnSeparableFilterARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnSeparableFilterARB) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetnSeparableFilterARB));
-}
-
-static inline void
-SET_GetnSeparableFilterARB(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                  GLsizei, GLvoid *, GLsizei,
-                                                  GLvoid *, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnSeparableFilterARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnTexImageARB) (GLenum, GLint, GLenum,
-                                                   GLenum, GLsizei, GLvoid *);
-#define CALL_GetnTexImageARB(disp, parameters) \
-    (* GET_GetnTexImageARB(disp)) parameters
-static inline _glptr_GetnTexImageARB
-GET_GetnTexImageARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnTexImageARB) (GET_by_offset
-                                     (disp, _gloffset_GetnTexImageARB));
-}
-
-static inline void
-SET_GetnTexImageARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLenum, GLint, GLenum, GLenum,
-                                           GLsizei, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnTexImageARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnUniformdvARB) (GLhandleARB, GLint, GLsizei,
-                                                    GLdouble *);
-#define CALL_GetnUniformdvARB(disp, parameters) \
-    (* GET_GetnUniformdvARB(disp)) parameters
-static inline _glptr_GetnUniformdvARB
-GET_GetnUniformdvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnUniformdvARB) (GET_by_offset
-                                      (disp, _gloffset_GetnUniformdvARB));
-}
-
-static inline void
-SET_GetnUniformdvARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLhandleARB, GLint, GLsizei,
-                                            GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetnUniformdvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnUniformfvARB) (GLhandleARB, GLint, GLsizei,
-                                                    GLfloat *);
-#define CALL_GetnUniformfvARB(disp, parameters) \
-    (* GET_GetnUniformfvARB(disp)) parameters
-static inline _glptr_GetnUniformfvARB
-GET_GetnUniformfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnUniformfvARB) (GET_by_offset
-                                      (disp, _gloffset_GetnUniformfvARB));
-}
-
-static inline void
-SET_GetnUniformfvARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLhandleARB, GLint, GLsizei,
-                                            GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetnUniformfvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnUniformivARB) (GLhandleARB, GLint, GLsizei,
-                                                    GLint *);
-#define CALL_GetnUniformivARB(disp, parameters) \
-    (* GET_GetnUniformivARB(disp)) parameters
-static inline _glptr_GetnUniformivARB
-GET_GetnUniformivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnUniformivARB) (GET_by_offset
-                                      (disp, _gloffset_GetnUniformivARB));
-}
-
-static inline void
-SET_GetnUniformivARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLhandleARB, GLint, GLsizei,
-                                            GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetnUniformivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetnUniformuivARB) (GLhandleARB, GLint,
-                                                     GLsizei, GLuint *);
-#define CALL_GetnUniformuivARB(disp, parameters) \
-    (* GET_GetnUniformuivARB(disp)) parameters
-static inline _glptr_GetnUniformuivARB
-GET_GetnUniformuivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnUniformuivARB) (GET_by_offset
-                                       (disp, _gloffset_GetnUniformuivARB));
-}
-
-static inline void
-SET_GetnUniformuivARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLhandleARB, GLint, GLsizei,
-                                             GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetnUniformuivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ReadnPixelsARB) (GLint, GLint, GLsizei,
-                                                  GLsizei, GLenum, GLenum,
-                                                  GLsizei, GLvoid *);
-#define CALL_ReadnPixelsARB(disp, parameters) \
-    (* GET_ReadnPixelsARB(disp)) parameters
-static inline _glptr_ReadnPixelsARB
-GET_ReadnPixelsARB(struct _glapi_table *disp)
-{
-    return (_glptr_ReadnPixelsARB) (GET_by_offset
-                                    (disp, _gloffset_ReadnPixelsARB));
-}
-
-static inline void
-SET_ReadnPixelsARB(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLint, GLint, GLsizei, GLsizei,
-                                          GLenum, GLenum, GLsizei, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ReadnPixelsARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexStorage1D) (GLenum, GLsizei, GLenum,
-                                                GLsizei);
-#define CALL_TexStorage1D(disp, parameters) \
-    (* GET_TexStorage1D(disp)) parameters
-static inline _glptr_TexStorage1D
-GET_TexStorage1D(struct _glapi_table *disp)
-{
-    return (_glptr_TexStorage1D) (GET_by_offset(disp, _gloffset_TexStorage1D));
-}
-
-static inline void
-SET_TexStorage1D(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_TexStorage1D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexStorage2D) (GLenum, GLsizei, GLenum,
-                                                GLsizei, GLsizei);
-#define CALL_TexStorage2D(disp, parameters) \
-    (* GET_TexStorage2D(disp)) parameters
-static inline _glptr_TexStorage2D
-GET_TexStorage2D(struct _glapi_table *disp)
-{
-    return (_glptr_TexStorage2D) (GET_by_offset(disp, _gloffset_TexStorage2D));
-}
-
-static inline void
-SET_TexStorage2D(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum, GLsizei,
-                                        GLsizei))
-{
-    SET_by_offset(disp, _gloffset_TexStorage2D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexStorage3D) (GLenum, GLsizei, GLenum,
-                                                GLsizei, GLsizei, GLsizei);
-#define CALL_TexStorage3D(disp, parameters) \
-    (* GET_TexStorage3D(disp)) parameters
-static inline _glptr_TexStorage3D
-GET_TexStorage3D(struct _glapi_table *disp)
-{
-    return (_glptr_TexStorage3D) (GET_by_offset(disp, _gloffset_TexStorage3D));
-}
-
-static inline void
-SET_TexStorage3D(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum, GLsizei,
-                                        GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_TexStorage3D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TextureStorage1DEXT) (GLuint, GLenum, GLsizei,
-                                                       GLenum, GLsizei);
-#define CALL_TextureStorage1DEXT(disp, parameters) \
-    (* GET_TextureStorage1DEXT(disp)) parameters
-static inline _glptr_TextureStorage1DEXT
-GET_TextureStorage1DEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TextureStorage1DEXT) (GET_by_offset
-                                         (disp, _gloffset_TextureStorage1DEXT));
-}
-
-static inline void
-SET_TextureStorage1DEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, GLsizei, GLenum,
-                                               GLsizei))
-{
-    SET_by_offset(disp, _gloffset_TextureStorage1DEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TextureStorage2DEXT) (GLuint, GLenum, GLsizei,
-                                                       GLenum, GLsizei,
-                                                       GLsizei);
-#define CALL_TextureStorage2DEXT(disp, parameters) \
-    (* GET_TextureStorage2DEXT(disp)) parameters
-static inline _glptr_TextureStorage2DEXT
-GET_TextureStorage2DEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TextureStorage2DEXT) (GET_by_offset
-                                         (disp, _gloffset_TextureStorage2DEXT));
-}
-
-static inline void
-SET_TextureStorage2DEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, GLsizei, GLenum,
-                                               GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_TextureStorage2DEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TextureStorage3DEXT) (GLuint, GLenum, GLsizei,
-                                                       GLenum, GLsizei, GLsizei,
-                                                       GLsizei);
-#define CALL_TextureStorage3DEXT(disp, parameters) \
-    (* GET_TextureStorage3DEXT(disp)) parameters
-static inline _glptr_TextureStorage3DEXT
-GET_TextureStorage3DEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TextureStorage3DEXT) (GET_by_offset
-                                         (disp, _gloffset_TextureStorage3DEXT));
-}
-
-static inline void
-SET_TextureStorage3DEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, GLsizei, GLenum,
-                                               GLsizei, GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_TextureStorage3DEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PolygonOffsetEXT) (GLfloat, GLfloat);
-
-#define CALL_PolygonOffsetEXT(disp, parameters) \
-    (* GET_PolygonOffsetEXT(disp)) parameters
-static inline _glptr_PolygonOffsetEXT
-GET_PolygonOffsetEXT(struct _glapi_table *disp)
-{
-    return (_glptr_PolygonOffsetEXT) (GET_by_offset
-                                      (disp, _gloffset_PolygonOffsetEXT));
-}
-
-static inline void
-SET_PolygonOffsetEXT(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PolygonOffsetEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetPixelTexGenParameterfvSGIS) (GLenum,
-                                                                 GLfloat *);
-#define CALL_GetPixelTexGenParameterfvSGIS(disp, parameters) \
-    (* GET_GetPixelTexGenParameterfvSGIS(disp)) parameters
-static inline _glptr_GetPixelTexGenParameterfvSGIS
-GET_GetPixelTexGenParameterfvSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_GetPixelTexGenParameterfvSGIS) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetPixelTexGenParameterfvSGIS));
-}
-
-static inline void
-SET_GetPixelTexGenParameterfvSGIS(struct _glapi_table *disp,
-                                  void (GLAPIENTRYP fn) (GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetPixelTexGenParameterfvSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetPixelTexGenParameterivSGIS) (GLenum,
-                                                                 GLint *);
-#define CALL_GetPixelTexGenParameterivSGIS(disp, parameters) \
-    (* GET_GetPixelTexGenParameterivSGIS(disp)) parameters
-static inline _glptr_GetPixelTexGenParameterivSGIS
-GET_GetPixelTexGenParameterivSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_GetPixelTexGenParameterivSGIS) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetPixelTexGenParameterivSGIS));
-}
-
-static inline void
-SET_GetPixelTexGenParameterivSGIS(struct _glapi_table *disp,
-                                  void (GLAPIENTRYP fn) (GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetPixelTexGenParameterivSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelTexGenParameterfSGIS) (GLenum, GLfloat);
-
-#define CALL_PixelTexGenParameterfSGIS(disp, parameters) \
-    (* GET_PixelTexGenParameterfSGIS(disp)) parameters
-static inline _glptr_PixelTexGenParameterfSGIS
-GET_PixelTexGenParameterfSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTexGenParameterfSGIS) (GET_by_offset
-                                               (disp,
-                                                _gloffset_PixelTexGenParameterfSGIS));
-}
-
-static inline void
-SET_PixelTexGenParameterfSGIS(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PixelTexGenParameterfSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelTexGenParameterfvSGIS) (GLenum,
-                                                              const GLfloat *);
-#define CALL_PixelTexGenParameterfvSGIS(disp, parameters) \
-    (* GET_PixelTexGenParameterfvSGIS(disp)) parameters
-static inline _glptr_PixelTexGenParameterfvSGIS
-GET_PixelTexGenParameterfvSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTexGenParameterfvSGIS) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_PixelTexGenParameterfvSGIS));
-}
-
-static inline void
-SET_PixelTexGenParameterfvSGIS(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_PixelTexGenParameterfvSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelTexGenParameteriSGIS) (GLenum, GLint);
-
-#define CALL_PixelTexGenParameteriSGIS(disp, parameters) \
-    (* GET_PixelTexGenParameteriSGIS(disp)) parameters
-static inline _glptr_PixelTexGenParameteriSGIS
-GET_PixelTexGenParameteriSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTexGenParameteriSGIS) (GET_by_offset
-                                               (disp,
-                                                _gloffset_PixelTexGenParameteriSGIS));
-}
-
-static inline void
-SET_PixelTexGenParameteriSGIS(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_PixelTexGenParameteriSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelTexGenParameterivSGIS) (GLenum,
-                                                              const GLint *);
-#define CALL_PixelTexGenParameterivSGIS(disp, parameters) \
-    (* GET_PixelTexGenParameterivSGIS(disp)) parameters
-static inline _glptr_PixelTexGenParameterivSGIS
-GET_PixelTexGenParameterivSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTexGenParameterivSGIS) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_PixelTexGenParameterivSGIS));
-}
-
-static inline void
-SET_PixelTexGenParameterivSGIS(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_PixelTexGenParameterivSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SampleMaskSGIS) (GLclampf, GLboolean);
-
-#define CALL_SampleMaskSGIS(disp, parameters) \
-    (* GET_SampleMaskSGIS(disp)) parameters
-static inline _glptr_SampleMaskSGIS
-GET_SampleMaskSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_SampleMaskSGIS) (GET_by_offset
-                                    (disp, _gloffset_SampleMaskSGIS));
-}
-
-static inline void
-SET_SampleMaskSGIS(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLclampf, GLboolean))
-{
-    SET_by_offset(disp, _gloffset_SampleMaskSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SamplePatternSGIS) (GLenum);
-
-#define CALL_SamplePatternSGIS(disp, parameters) \
-    (* GET_SamplePatternSGIS(disp)) parameters
-static inline _glptr_SamplePatternSGIS
-GET_SamplePatternSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_SamplePatternSGIS) (GET_by_offset
-                                       (disp, _gloffset_SamplePatternSGIS));
-}
-
-static inline void
-SET_SamplePatternSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_SamplePatternSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorPointerEXT) (GLint, GLenum, GLsizei,
-                                                   GLsizei, const GLvoid *);
-#define CALL_ColorPointerEXT(disp, parameters) \
-    (* GET_ColorPointerEXT(disp)) parameters
-static inline _glptr_ColorPointerEXT
-GET_ColorPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ColorPointerEXT) (GET_by_offset
-                                     (disp, _gloffset_ColorPointerEXT));
-}
-
-static inline void
-SET_ColorPointerEXT(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei, GLsizei,
-                                           const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ColorPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EdgeFlagPointerEXT) (GLsizei, GLsizei,
-                                                      const GLboolean *);
-#define CALL_EdgeFlagPointerEXT(disp, parameters) \
-    (* GET_EdgeFlagPointerEXT(disp)) parameters
-static inline _glptr_EdgeFlagPointerEXT
-GET_EdgeFlagPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_EdgeFlagPointerEXT) (GET_by_offset
-                                        (disp, _gloffset_EdgeFlagPointerEXT));
-}
-
-static inline void
-SET_EdgeFlagPointerEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLsizei, GLsizei,
-                                              const GLboolean *))
-{
-    SET_by_offset(disp, _gloffset_EdgeFlagPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_IndexPointerEXT) (GLenum, GLsizei, GLsizei,
-                                                   const GLvoid *);
-#define CALL_IndexPointerEXT(disp, parameters) \
-    (* GET_IndexPointerEXT(disp)) parameters
-static inline _glptr_IndexPointerEXT
-GET_IndexPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_IndexPointerEXT) (GET_by_offset
-                                     (disp, _gloffset_IndexPointerEXT));
-}
-
-static inline void
-SET_IndexPointerEXT(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLenum, GLsizei, GLsizei,
-                                           const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_IndexPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_NormalPointerEXT) (GLenum, GLsizei, GLsizei,
-                                                    const GLvoid *);
-#define CALL_NormalPointerEXT(disp, parameters) \
-    (* GET_NormalPointerEXT(disp)) parameters
-static inline _glptr_NormalPointerEXT
-GET_NormalPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_NormalPointerEXT) (GET_by_offset
-                                      (disp, _gloffset_NormalPointerEXT));
-}
-
-static inline void
-SET_NormalPointerEXT(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLsizei, GLsizei,
-                                            const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_NormalPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexCoordPointerEXT) (GLint, GLenum, GLsizei,
-                                                      GLsizei, const GLvoid *);
-#define CALL_TexCoordPointerEXT(disp, parameters) \
-    (* GET_TexCoordPointerEXT(disp)) parameters
-static inline _glptr_TexCoordPointerEXT
-GET_TexCoordPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordPointerEXT) (GET_by_offset
-                                        (disp, _gloffset_TexCoordPointerEXT));
-}
-
-static inline void
-SET_TexCoordPointerEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei, GLsizei,
-                                              const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexCoordPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexPointerEXT) (GLint, GLenum, GLsizei,
-                                                    GLsizei, const GLvoid *);
-#define CALL_VertexPointerEXT(disp, parameters) \
-    (* GET_VertexPointerEXT(disp)) parameters
-static inline _glptr_VertexPointerEXT
-GET_VertexPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexPointerEXT) (GET_by_offset
-                                      (disp, _gloffset_VertexPointerEXT));
-}
-
-static inline void
-SET_VertexPointerEXT(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei, GLsizei,
-                                            const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_VertexPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PointParameterfEXT) (GLenum, GLfloat);
-
-#define CALL_PointParameterfEXT(disp, parameters) \
-    (* GET_PointParameterfEXT(disp)) parameters
-static inline _glptr_PointParameterfEXT
-GET_PointParameterfEXT(struct _glapi_table *disp)
-{
-    return (_glptr_PointParameterfEXT) (GET_by_offset
-                                        (disp, _gloffset_PointParameterfEXT));
-}
-
-static inline void
-SET_PointParameterfEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PointParameterfEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PointParameterfvEXT) (GLenum, const GLfloat *);
-
-#define CALL_PointParameterfvEXT(disp, parameters) \
-    (* GET_PointParameterfvEXT(disp)) parameters
-static inline _glptr_PointParameterfvEXT
-GET_PointParameterfvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_PointParameterfvEXT) (GET_by_offset
-                                         (disp, _gloffset_PointParameterfvEXT));
-}
-
-static inline void
-SET_PointParameterfvEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_PointParameterfvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LockArraysEXT) (GLint, GLsizei);
-
-#define CALL_LockArraysEXT(disp, parameters) \
-    (* GET_LockArraysEXT(disp)) parameters
-static inline _glptr_LockArraysEXT
-GET_LockArraysEXT(struct _glapi_table *disp)
-{
-    return (_glptr_LockArraysEXT) (GET_by_offset
-                                   (disp, _gloffset_LockArraysEXT));
-}
-
-static inline void
-SET_LockArraysEXT(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_LockArraysEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UnlockArraysEXT) (void);
-
-#define CALL_UnlockArraysEXT(disp, parameters) \
-    (* GET_UnlockArraysEXT(disp)) parameters
-static inline _glptr_UnlockArraysEXT
-GET_UnlockArraysEXT(struct _glapi_table *disp)
-{
-    return (_glptr_UnlockArraysEXT) (GET_by_offset
-                                     (disp, _gloffset_UnlockArraysEXT));
-}
-
-static inline void
-SET_UnlockArraysEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_UnlockArraysEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3bEXT) (GLbyte, GLbyte, GLbyte);
-
-#define CALL_SecondaryColor3bEXT(disp, parameters) \
-    (* GET_SecondaryColor3bEXT(disp)) parameters
-static inline _glptr_SecondaryColor3bEXT
-GET_SecondaryColor3bEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3bEXT) (GET_by_offset
-                                         (disp, _gloffset_SecondaryColor3bEXT));
-}
-
-static inline void
-SET_SecondaryColor3bEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLbyte, GLbyte, GLbyte))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3bEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3bvEXT) (const GLbyte *);
-
-#define CALL_SecondaryColor3bvEXT(disp, parameters) \
-    (* GET_SecondaryColor3bvEXT(disp)) parameters
-static inline _glptr_SecondaryColor3bvEXT
-GET_SecondaryColor3bvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3bvEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3bvEXT));
-}
-
-static inline void
-SET_SecondaryColor3bvEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3bvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3dEXT) (GLdouble, GLdouble,
-                                                       GLdouble);
-#define CALL_SecondaryColor3dEXT(disp, parameters) \
-    (* GET_SecondaryColor3dEXT(disp)) parameters
-static inline _glptr_SecondaryColor3dEXT
-GET_SecondaryColor3dEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3dEXT) (GET_by_offset
-                                         (disp, _gloffset_SecondaryColor3dEXT));
-}
-
-static inline void
-SET_SecondaryColor3dEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3dEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3dvEXT) (const GLdouble *);
-
-#define CALL_SecondaryColor3dvEXT(disp, parameters) \
-    (* GET_SecondaryColor3dvEXT(disp)) parameters
-static inline _glptr_SecondaryColor3dvEXT
-GET_SecondaryColor3dvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3dvEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3dvEXT));
-}
-
-static inline void
-SET_SecondaryColor3dvEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3dvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3fEXT) (GLfloat, GLfloat,
-                                                       GLfloat);
-#define CALL_SecondaryColor3fEXT(disp, parameters) \
-    (* GET_SecondaryColor3fEXT(disp)) parameters
-static inline _glptr_SecondaryColor3fEXT
-GET_SecondaryColor3fEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3fEXT) (GET_by_offset
-                                         (disp, _gloffset_SecondaryColor3fEXT));
-}
-
-static inline void
-SET_SecondaryColor3fEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3fEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3fvEXT) (const GLfloat *);
-
-#define CALL_SecondaryColor3fvEXT(disp, parameters) \
-    (* GET_SecondaryColor3fvEXT(disp)) parameters
-static inline _glptr_SecondaryColor3fvEXT
-GET_SecondaryColor3fvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3fvEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3fvEXT));
-}
-
-static inline void
-SET_SecondaryColor3fvEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3fvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3iEXT) (GLint, GLint, GLint);
-
-#define CALL_SecondaryColor3iEXT(disp, parameters) \
-    (* GET_SecondaryColor3iEXT(disp)) parameters
-static inline _glptr_SecondaryColor3iEXT
-GET_SecondaryColor3iEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3iEXT) (GET_by_offset
-                                         (disp, _gloffset_SecondaryColor3iEXT));
-}
-
-static inline void
-SET_SecondaryColor3iEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3iEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3ivEXT) (const GLint *);
-
-#define CALL_SecondaryColor3ivEXT(disp, parameters) \
-    (* GET_SecondaryColor3ivEXT(disp)) parameters
-static inline _glptr_SecondaryColor3ivEXT
-GET_SecondaryColor3ivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3ivEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3ivEXT));
-}
-
-static inline void
-SET_SecondaryColor3ivEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3ivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3sEXT) (GLshort, GLshort,
-                                                       GLshort);
-#define CALL_SecondaryColor3sEXT(disp, parameters) \
-    (* GET_SecondaryColor3sEXT(disp)) parameters
-static inline _glptr_SecondaryColor3sEXT
-GET_SecondaryColor3sEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3sEXT) (GET_by_offset
-                                         (disp, _gloffset_SecondaryColor3sEXT));
-}
-
-static inline void
-SET_SecondaryColor3sEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3sEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3svEXT) (const GLshort *);
-
-#define CALL_SecondaryColor3svEXT(disp, parameters) \
-    (* GET_SecondaryColor3svEXT(disp)) parameters
-static inline _glptr_SecondaryColor3svEXT
-GET_SecondaryColor3svEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3svEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3svEXT));
-}
-
-static inline void
-SET_SecondaryColor3svEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3svEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3ubEXT) (GLubyte, GLubyte,
-                                                        GLubyte);
-#define CALL_SecondaryColor3ubEXT(disp, parameters) \
-    (* GET_SecondaryColor3ubEXT(disp)) parameters
-static inline _glptr_SecondaryColor3ubEXT
-GET_SecondaryColor3ubEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3ubEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3ubEXT));
-}
-
-static inline void
-SET_SecondaryColor3ubEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLubyte, GLubyte, GLubyte))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3ubEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3ubvEXT) (const GLubyte *);
-
-#define CALL_SecondaryColor3ubvEXT(disp, parameters) \
-    (* GET_SecondaryColor3ubvEXT(disp)) parameters
-static inline _glptr_SecondaryColor3ubvEXT
-GET_SecondaryColor3ubvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3ubvEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_SecondaryColor3ubvEXT));
-}
-
-static inline void
-SET_SecondaryColor3ubvEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3ubvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3uiEXT) (GLuint, GLuint, GLuint);
-
-#define CALL_SecondaryColor3uiEXT(disp, parameters) \
-    (* GET_SecondaryColor3uiEXT(disp)) parameters
-static inline _glptr_SecondaryColor3uiEXT
-GET_SecondaryColor3uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3uiEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3uiEXT));
-}
-
-static inline void
-SET_SecondaryColor3uiEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3uiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3uivEXT) (const GLuint *);
-
-#define CALL_SecondaryColor3uivEXT(disp, parameters) \
-    (* GET_SecondaryColor3uivEXT(disp)) parameters
-static inline _glptr_SecondaryColor3uivEXT
-GET_SecondaryColor3uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3uivEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_SecondaryColor3uivEXT));
-}
-
-static inline void
-SET_SecondaryColor3uivEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3uivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3usEXT) (GLushort, GLushort,
-                                                        GLushort);
-#define CALL_SecondaryColor3usEXT(disp, parameters) \
-    (* GET_SecondaryColor3usEXT(disp)) parameters
-static inline _glptr_SecondaryColor3usEXT
-GET_SecondaryColor3usEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3usEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3usEXT));
-}
-
-static inline void
-SET_SecondaryColor3usEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLushort, GLushort, GLushort))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3usEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3usvEXT) (const GLushort *);
-
-#define CALL_SecondaryColor3usvEXT(disp, parameters) \
-    (* GET_SecondaryColor3usvEXT(disp)) parameters
-static inline _glptr_SecondaryColor3usvEXT
-GET_SecondaryColor3usvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3usvEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_SecondaryColor3usvEXT));
-}
-
-static inline void
-SET_SecondaryColor3usvEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3usvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColorPointerEXT) (GLint, GLenum,
-                                                            GLsizei,
-                                                            const GLvoid *);
-#define CALL_SecondaryColorPointerEXT(disp, parameters) \
-    (* GET_SecondaryColorPointerEXT(disp)) parameters
-static inline _glptr_SecondaryColorPointerEXT
-GET_SecondaryColorPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColorPointerEXT) (GET_by_offset
-                                              (disp,
-                                               _gloffset_SecondaryColorPointerEXT));
-}
-
-static inline void
-SET_SecondaryColorPointerEXT(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei,
-                                                    const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColorPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiDrawArraysEXT) (GLenum, const GLint *,
-                                                      const GLsizei *, GLsizei);
-#define CALL_MultiDrawArraysEXT(disp, parameters) \
-    (* GET_MultiDrawArraysEXT(disp)) parameters
-static inline _glptr_MultiDrawArraysEXT
-GET_MultiDrawArraysEXT(struct _glapi_table *disp)
-{
-    return (_glptr_MultiDrawArraysEXT) (GET_by_offset
-                                        (disp, _gloffset_MultiDrawArraysEXT));
-}
-
-static inline void
-SET_MultiDrawArraysEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, const GLint *,
-                                              const GLsizei *, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_MultiDrawArraysEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiDrawElementsEXT) (GLenum, const GLsizei *,
-                                                        GLenum, const GLvoid **,
-                                                        GLsizei);
-#define CALL_MultiDrawElementsEXT(disp, parameters) \
-    (* GET_MultiDrawElementsEXT(disp)) parameters
-static inline _glptr_MultiDrawElementsEXT
-GET_MultiDrawElementsEXT(struct _glapi_table *disp)
-{
-    return (_glptr_MultiDrawElementsEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_MultiDrawElementsEXT));
-}
-
-static inline void
-SET_MultiDrawElementsEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, const GLsizei *, GLenum,
-                                                const GLvoid **, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_MultiDrawElementsEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FogCoordPointerEXT) (GLenum, GLsizei,
-                                                      const GLvoid *);
-#define CALL_FogCoordPointerEXT(disp, parameters) \
-    (* GET_FogCoordPointerEXT(disp)) parameters
-static inline _glptr_FogCoordPointerEXT
-GET_FogCoordPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FogCoordPointerEXT) (GET_by_offset
-                                        (disp, _gloffset_FogCoordPointerEXT));
-}
-
-static inline void
-SET_FogCoordPointerEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_FogCoordPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FogCoorddEXT) (GLdouble);
-
-#define CALL_FogCoorddEXT(disp, parameters) \
-    (* GET_FogCoorddEXT(disp)) parameters
-static inline _glptr_FogCoorddEXT
-GET_FogCoorddEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FogCoorddEXT) (GET_by_offset(disp, _gloffset_FogCoorddEXT));
-}
-
-static inline void
-SET_FogCoorddEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLdouble))
-{
-    SET_by_offset(disp, _gloffset_FogCoorddEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FogCoorddvEXT) (const GLdouble *);
-
-#define CALL_FogCoorddvEXT(disp, parameters) \
-    (* GET_FogCoorddvEXT(disp)) parameters
-static inline _glptr_FogCoorddvEXT
-GET_FogCoorddvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FogCoorddvEXT) (GET_by_offset
-                                   (disp, _gloffset_FogCoorddvEXT));
-}
-
-static inline void
-SET_FogCoorddvEXT(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_FogCoorddvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FogCoordfEXT) (GLfloat);
-
-#define CALL_FogCoordfEXT(disp, parameters) \
-    (* GET_FogCoordfEXT(disp)) parameters
-static inline _glptr_FogCoordfEXT
-GET_FogCoordfEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FogCoordfEXT) (GET_by_offset(disp, _gloffset_FogCoordfEXT));
-}
-
-static inline void
-SET_FogCoordfEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_FogCoordfEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FogCoordfvEXT) (const GLfloat *);
-
-#define CALL_FogCoordfvEXT(disp, parameters) \
-    (* GET_FogCoordfvEXT(disp)) parameters
-static inline _glptr_FogCoordfvEXT
-GET_FogCoordfvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FogCoordfvEXT) (GET_by_offset
-                                   (disp, _gloffset_FogCoordfvEXT));
-}
-
-static inline void
-SET_FogCoordfvEXT(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_FogCoordfvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelTexGenSGIX) (GLenum);
-
-#define CALL_PixelTexGenSGIX(disp, parameters) \
-    (* GET_PixelTexGenSGIX(disp)) parameters
-static inline _glptr_PixelTexGenSGIX
-GET_PixelTexGenSGIX(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTexGenSGIX) (GET_by_offset
-                                     (disp, _gloffset_PixelTexGenSGIX));
-}
-
-static inline void
-SET_PixelTexGenSGIX(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_PixelTexGenSGIX, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BlendFuncSeparateEXT) (GLenum, GLenum, GLenum,
-                                                        GLenum);
-#define CALL_BlendFuncSeparateEXT(disp, parameters) \
-    (* GET_BlendFuncSeparateEXT(disp)) parameters
-static inline _glptr_BlendFuncSeparateEXT
-GET_BlendFuncSeparateEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BlendFuncSeparateEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_BlendFuncSeparateEXT));
-}
-
-static inline void
-SET_BlendFuncSeparateEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendFuncSeparateEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FlushVertexArrayRangeNV) (void);
-
-#define CALL_FlushVertexArrayRangeNV(disp, parameters) \
-    (* GET_FlushVertexArrayRangeNV(disp)) parameters
-static inline _glptr_FlushVertexArrayRangeNV
-GET_FlushVertexArrayRangeNV(struct _glapi_table *disp)
-{
-    return (_glptr_FlushVertexArrayRangeNV) (GET_by_offset
-                                             (disp,
-                                              _gloffset_FlushVertexArrayRangeNV));
-}
-
-static inline void
-SET_FlushVertexArrayRangeNV(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_FlushVertexArrayRangeNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexArrayRangeNV) (GLsizei, const GLvoid *);
-
-#define CALL_VertexArrayRangeNV(disp, parameters) \
-    (* GET_VertexArrayRangeNV(disp)) parameters
-static inline _glptr_VertexArrayRangeNV
-GET_VertexArrayRangeNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexArrayRangeNV) (GET_by_offset
-                                        (disp, _gloffset_VertexArrayRangeNV));
-}
-
-static inline void
-SET_VertexArrayRangeNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_VertexArrayRangeNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CombinerInputNV) (GLenum, GLenum, GLenum,
-                                                   GLenum, GLenum, GLenum);
-#define CALL_CombinerInputNV(disp, parameters) \
-    (* GET_CombinerInputNV(disp)) parameters
-static inline _glptr_CombinerInputNV
-GET_CombinerInputNV(struct _glapi_table *disp)
-{
-    return (_glptr_CombinerInputNV) (GET_by_offset
-                                     (disp, _gloffset_CombinerInputNV));
-}
-
-static inline void
-SET_CombinerInputNV(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLenum,
-                                           GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_CombinerInputNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CombinerOutputNV) (GLenum, GLenum, GLenum,
-                                                    GLenum, GLenum, GLenum,
-                                                    GLenum, GLboolean,
-                                                    GLboolean, GLboolean);
-#define CALL_CombinerOutputNV(disp, parameters) \
-    (* GET_CombinerOutputNV(disp)) parameters
-static inline _glptr_CombinerOutputNV
-GET_CombinerOutputNV(struct _glapi_table *disp)
-{
-    return (_glptr_CombinerOutputNV) (GET_by_offset
-                                      (disp, _gloffset_CombinerOutputNV));
-}
-
-static inline void
-SET_CombinerOutputNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLenum,
-                                            GLenum, GLenum, GLenum, GLboolean,
-                                            GLboolean, GLboolean))
-{
-    SET_by_offset(disp, _gloffset_CombinerOutputNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CombinerParameterfNV) (GLenum, GLfloat);
-
-#define CALL_CombinerParameterfNV(disp, parameters) \
-    (* GET_CombinerParameterfNV(disp)) parameters
-static inline _glptr_CombinerParameterfNV
-GET_CombinerParameterfNV(struct _glapi_table *disp)
-{
-    return (_glptr_CombinerParameterfNV) (GET_by_offset
-                                          (disp,
-                                           _gloffset_CombinerParameterfNV));
-}
-
-static inline void
-SET_CombinerParameterfNV(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_CombinerParameterfNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CombinerParameterfvNV) (GLenum,
-                                                         const GLfloat *);
-#define CALL_CombinerParameterfvNV(disp, parameters) \
-    (* GET_CombinerParameterfvNV(disp)) parameters
-static inline _glptr_CombinerParameterfvNV
-GET_CombinerParameterfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_CombinerParameterfvNV) (GET_by_offset
-                                           (disp,
-                                            _gloffset_CombinerParameterfvNV));
-}
-
-static inline void
-SET_CombinerParameterfvNV(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_CombinerParameterfvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CombinerParameteriNV) (GLenum, GLint);
-
-#define CALL_CombinerParameteriNV(disp, parameters) \
-    (* GET_CombinerParameteriNV(disp)) parameters
-static inline _glptr_CombinerParameteriNV
-GET_CombinerParameteriNV(struct _glapi_table *disp)
-{
-    return (_glptr_CombinerParameteriNV) (GET_by_offset
-                                          (disp,
-                                           _gloffset_CombinerParameteriNV));
-}
-
-static inline void
-SET_CombinerParameteriNV(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_CombinerParameteriNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CombinerParameterivNV) (GLenum, const GLint *);
-
-#define CALL_CombinerParameterivNV(disp, parameters) \
-    (* GET_CombinerParameterivNV(disp)) parameters
-static inline _glptr_CombinerParameterivNV
-GET_CombinerParameterivNV(struct _glapi_table *disp)
-{
-    return (_glptr_CombinerParameterivNV) (GET_by_offset
-                                           (disp,
-                                            _gloffset_CombinerParameterivNV));
-}
-
-static inline void
-SET_CombinerParameterivNV(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_CombinerParameterivNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FinalCombinerInputNV) (GLenum, GLenum, GLenum,
-                                                        GLenum);
-#define CALL_FinalCombinerInputNV(disp, parameters) \
-    (* GET_FinalCombinerInputNV(disp)) parameters
-static inline _glptr_FinalCombinerInputNV
-GET_FinalCombinerInputNV(struct _glapi_table *disp)
-{
-    return (_glptr_FinalCombinerInputNV) (GET_by_offset
-                                          (disp,
-                                           _gloffset_FinalCombinerInputNV));
-}
-
-static inline void
-SET_FinalCombinerInputNV(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_FinalCombinerInputNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetCombinerInputParameterfvNV) (GLenum, GLenum,
-                                                                 GLenum, GLenum,
-                                                                 GLfloat *);
-#define CALL_GetCombinerInputParameterfvNV(disp, parameters) \
-    (* GET_GetCombinerInputParameterfvNV(disp)) parameters
-static inline _glptr_GetCombinerInputParameterfvNV
-GET_GetCombinerInputParameterfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetCombinerInputParameterfvNV) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetCombinerInputParameterfvNV));
-}
-
-static inline void
-SET_GetCombinerInputParameterfvNV(struct _glapi_table *disp,
-                                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                         GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetCombinerInputParameterfvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetCombinerInputParameterivNV) (GLenum, GLenum,
-                                                                 GLenum, GLenum,
-                                                                 GLint *);
-#define CALL_GetCombinerInputParameterivNV(disp, parameters) \
-    (* GET_GetCombinerInputParameterivNV(disp)) parameters
-static inline _glptr_GetCombinerInputParameterivNV
-GET_GetCombinerInputParameterivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetCombinerInputParameterivNV) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetCombinerInputParameterivNV));
-}
-
-static inline void
-SET_GetCombinerInputParameterivNV(struct _glapi_table *disp,
-                                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                         GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetCombinerInputParameterivNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetCombinerOutputParameterfvNV) (GLenum,
-                                                                  GLenum,
-                                                                  GLenum,
-                                                                  GLfloat *);
-#define CALL_GetCombinerOutputParameterfvNV(disp, parameters) \
-    (* GET_GetCombinerOutputParameterfvNV(disp)) parameters
-static inline _glptr_GetCombinerOutputParameterfvNV
-GET_GetCombinerOutputParameterfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetCombinerOutputParameterfvNV) (GET_by_offset
-                                                    (disp,
-                                                     _gloffset_GetCombinerOutputParameterfvNV));
-}
-
-static inline void
-SET_GetCombinerOutputParameterfvNV(struct _glapi_table *disp,
-                                   void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                          GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetCombinerOutputParameterfvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetCombinerOutputParameterivNV) (GLenum,
-                                                                  GLenum,
-                                                                  GLenum,
-                                                                  GLint *);
-#define CALL_GetCombinerOutputParameterivNV(disp, parameters) \
-    (* GET_GetCombinerOutputParameterivNV(disp)) parameters
-static inline _glptr_GetCombinerOutputParameterivNV
-GET_GetCombinerOutputParameterivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetCombinerOutputParameterivNV) (GET_by_offset
-                                                    (disp,
-                                                     _gloffset_GetCombinerOutputParameterivNV));
-}
-
-static inline void
-SET_GetCombinerOutputParameterivNV(struct _glapi_table *disp,
-                                   void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                          GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetCombinerOutputParameterivNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetFinalCombinerInputParameterfvNV) (GLenum,
-                                                                      GLenum,
-                                                                      GLfloat
-                                                                      *);
-#define CALL_GetFinalCombinerInputParameterfvNV(disp, parameters) \
-    (* GET_GetFinalCombinerInputParameterfvNV(disp)) parameters
-static inline _glptr_GetFinalCombinerInputParameterfvNV
-GET_GetFinalCombinerInputParameterfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetFinalCombinerInputParameterfvNV) (GET_by_offset
-                                                        (disp,
-                                                         _gloffset_GetFinalCombinerInputParameterfvNV));
-}
-
-static inline void
-SET_GetFinalCombinerInputParameterfvNV(struct _glapi_table *disp,
-                                       void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                              GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetFinalCombinerInputParameterfvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetFinalCombinerInputParameterivNV) (GLenum,
-                                                                      GLenum,
-                                                                      GLint *);
-#define CALL_GetFinalCombinerInputParameterivNV(disp, parameters) \
-    (* GET_GetFinalCombinerInputParameterivNV(disp)) parameters
-static inline _glptr_GetFinalCombinerInputParameterivNV
-GET_GetFinalCombinerInputParameterivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetFinalCombinerInputParameterivNV) (GET_by_offset
-                                                        (disp,
-                                                         _gloffset_GetFinalCombinerInputParameterivNV));
-}
-
-static inline void
-SET_GetFinalCombinerInputParameterivNV(struct _glapi_table *disp,
-                                       void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                              GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetFinalCombinerInputParameterivNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ResizeBuffersMESA) (void);
-
-#define CALL_ResizeBuffersMESA(disp, parameters) \
-    (* GET_ResizeBuffersMESA(disp)) parameters
-static inline _glptr_ResizeBuffersMESA
-GET_ResizeBuffersMESA(struct _glapi_table *disp)
-{
-    return (_glptr_ResizeBuffersMESA) (GET_by_offset
-                                       (disp, _gloffset_ResizeBuffersMESA));
-}
-
-static inline void
-SET_ResizeBuffersMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_ResizeBuffersMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos2dMESA) (GLdouble, GLdouble);
-
-#define CALL_WindowPos2dMESA(disp, parameters) \
-    (* GET_WindowPos2dMESA(disp)) parameters
-static inline _glptr_WindowPos2dMESA
-GET_WindowPos2dMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2dMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos2dMESA));
-}
-
-static inline void
-SET_WindowPos2dMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2dMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos2dvMESA) (const GLdouble *);
-
-#define CALL_WindowPos2dvMESA(disp, parameters) \
-    (* GET_WindowPos2dvMESA(disp)) parameters
-static inline _glptr_WindowPos2dvMESA
-GET_WindowPos2dvMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2dvMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos2dvMESA));
-}
-
-static inline void
-SET_WindowPos2dvMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2dvMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos2fMESA) (GLfloat, GLfloat);
-
-#define CALL_WindowPos2fMESA(disp, parameters) \
-    (* GET_WindowPos2fMESA(disp)) parameters
-static inline _glptr_WindowPos2fMESA
-GET_WindowPos2fMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2fMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos2fMESA));
-}
-
-static inline void
-SET_WindowPos2fMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2fMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos2fvMESA) (const GLfloat *);
-
-#define CALL_WindowPos2fvMESA(disp, parameters) \
-    (* GET_WindowPos2fvMESA(disp)) parameters
-static inline _glptr_WindowPos2fvMESA
-GET_WindowPos2fvMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2fvMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos2fvMESA));
-}
-
-static inline void
-SET_WindowPos2fvMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2fvMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos2iMESA) (GLint, GLint);
-
-#define CALL_WindowPos2iMESA(disp, parameters) \
-    (* GET_WindowPos2iMESA(disp)) parameters
-static inline _glptr_WindowPos2iMESA
-GET_WindowPos2iMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2iMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos2iMESA));
-}
-
-static inline void
-SET_WindowPos2iMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2iMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos2ivMESA) (const GLint *);
-
-#define CALL_WindowPos2ivMESA(disp, parameters) \
-    (* GET_WindowPos2ivMESA(disp)) parameters
-static inline _glptr_WindowPos2ivMESA
-GET_WindowPos2ivMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2ivMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos2ivMESA));
-}
-
-static inline void
-SET_WindowPos2ivMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2ivMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos2sMESA) (GLshort, GLshort);
-
-#define CALL_WindowPos2sMESA(disp, parameters) \
-    (* GET_WindowPos2sMESA(disp)) parameters
-static inline _glptr_WindowPos2sMESA
-GET_WindowPos2sMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2sMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos2sMESA));
-}
-
-static inline void
-SET_WindowPos2sMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2sMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos2svMESA) (const GLshort *);
-
-#define CALL_WindowPos2svMESA(disp, parameters) \
-    (* GET_WindowPos2svMESA(disp)) parameters
-static inline _glptr_WindowPos2svMESA
-GET_WindowPos2svMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2svMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos2svMESA));
-}
-
-static inline void
-SET_WindowPos2svMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2svMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos3dMESA) (GLdouble, GLdouble,
-                                                   GLdouble);
-#define CALL_WindowPos3dMESA(disp, parameters) \
-    (* GET_WindowPos3dMESA(disp)) parameters
-static inline _glptr_WindowPos3dMESA
-GET_WindowPos3dMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3dMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos3dMESA));
-}
-
-static inline void
-SET_WindowPos3dMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3dMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos3dvMESA) (const GLdouble *);
-
-#define CALL_WindowPos3dvMESA(disp, parameters) \
-    (* GET_WindowPos3dvMESA(disp)) parameters
-static inline _glptr_WindowPos3dvMESA
-GET_WindowPos3dvMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3dvMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos3dvMESA));
-}
-
-static inline void
-SET_WindowPos3dvMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3dvMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos3fMESA) (GLfloat, GLfloat, GLfloat);
-
-#define CALL_WindowPos3fMESA(disp, parameters) \
-    (* GET_WindowPos3fMESA(disp)) parameters
-static inline _glptr_WindowPos3fMESA
-GET_WindowPos3fMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3fMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos3fMESA));
-}
-
-static inline void
-SET_WindowPos3fMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3fMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos3fvMESA) (const GLfloat *);
-
-#define CALL_WindowPos3fvMESA(disp, parameters) \
-    (* GET_WindowPos3fvMESA(disp)) parameters
-static inline _glptr_WindowPos3fvMESA
-GET_WindowPos3fvMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3fvMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos3fvMESA));
-}
-
-static inline void
-SET_WindowPos3fvMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3fvMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos3iMESA) (GLint, GLint, GLint);
-
-#define CALL_WindowPos3iMESA(disp, parameters) \
-    (* GET_WindowPos3iMESA(disp)) parameters
-static inline _glptr_WindowPos3iMESA
-GET_WindowPos3iMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3iMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos3iMESA));
-}
-
-static inline void
-SET_WindowPos3iMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3iMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos3ivMESA) (const GLint *);
-
-#define CALL_WindowPos3ivMESA(disp, parameters) \
-    (* GET_WindowPos3ivMESA(disp)) parameters
-static inline _glptr_WindowPos3ivMESA
-GET_WindowPos3ivMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3ivMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos3ivMESA));
-}
-
-static inline void
-SET_WindowPos3ivMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3ivMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos3sMESA) (GLshort, GLshort, GLshort);
-
-#define CALL_WindowPos3sMESA(disp, parameters) \
-    (* GET_WindowPos3sMESA(disp)) parameters
-static inline _glptr_WindowPos3sMESA
-GET_WindowPos3sMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3sMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos3sMESA));
-}
-
-static inline void
-SET_WindowPos3sMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3sMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos3svMESA) (const GLshort *);
-
-#define CALL_WindowPos3svMESA(disp, parameters) \
-    (* GET_WindowPos3svMESA(disp)) parameters
-static inline _glptr_WindowPos3svMESA
-GET_WindowPos3svMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3svMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos3svMESA));
-}
-
-static inline void
-SET_WindowPos3svMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3svMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos4dMESA) (GLdouble, GLdouble, GLdouble,
-                                                   GLdouble);
-#define CALL_WindowPos4dMESA(disp, parameters) \
-    (* GET_WindowPos4dMESA(disp)) parameters
-static inline _glptr_WindowPos4dMESA
-GET_WindowPos4dMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4dMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos4dMESA));
-}
-
-static inline void
-SET_WindowPos4dMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble,
-                                           GLdouble))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4dMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos4dvMESA) (const GLdouble *);
-
-#define CALL_WindowPos4dvMESA(disp, parameters) \
-    (* GET_WindowPos4dvMESA(disp)) parameters
-static inline _glptr_WindowPos4dvMESA
-GET_WindowPos4dvMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4dvMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos4dvMESA));
-}
-
-static inline void
-SET_WindowPos4dvMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4dvMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos4fMESA) (GLfloat, GLfloat, GLfloat,
-                                                   GLfloat);
-#define CALL_WindowPos4fMESA(disp, parameters) \
-    (* GET_WindowPos4fMESA(disp)) parameters
-static inline _glptr_WindowPos4fMESA
-GET_WindowPos4fMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4fMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos4fMESA));
-}
-
-static inline void
-SET_WindowPos4fMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4fMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos4fvMESA) (const GLfloat *);
-
-#define CALL_WindowPos4fvMESA(disp, parameters) \
-    (* GET_WindowPos4fvMESA(disp)) parameters
-static inline _glptr_WindowPos4fvMESA
-GET_WindowPos4fvMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4fvMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos4fvMESA));
-}
-
-static inline void
-SET_WindowPos4fvMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4fvMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos4iMESA) (GLint, GLint, GLint, GLint);
-
-#define CALL_WindowPos4iMESA(disp, parameters) \
-    (* GET_WindowPos4iMESA(disp)) parameters
-static inline _glptr_WindowPos4iMESA
-GET_WindowPos4iMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4iMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos4iMESA));
-}
-
-static inline void
-SET_WindowPos4iMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4iMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos4ivMESA) (const GLint *);
-
-#define CALL_WindowPos4ivMESA(disp, parameters) \
-    (* GET_WindowPos4ivMESA(disp)) parameters
-static inline _glptr_WindowPos4ivMESA
-GET_WindowPos4ivMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4ivMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos4ivMESA));
-}
-
-static inline void
-SET_WindowPos4ivMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4ivMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos4sMESA) (GLshort, GLshort, GLshort,
-                                                   GLshort);
-#define CALL_WindowPos4sMESA(disp, parameters) \
-    (* GET_WindowPos4sMESA(disp)) parameters
-static inline _glptr_WindowPos4sMESA
-GET_WindowPos4sMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4sMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos4sMESA));
-}
-
-static inline void
-SET_WindowPos4sMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4sMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_WindowPos4svMESA) (const GLshort *);
-
-#define CALL_WindowPos4svMESA(disp, parameters) \
-    (* GET_WindowPos4svMESA(disp)) parameters
-static inline _glptr_WindowPos4svMESA
-GET_WindowPos4svMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4svMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos4svMESA));
-}
-
-static inline void
-SET_WindowPos4svMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4svMESA, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiModeDrawArraysIBM) (const GLenum *,
-                                                          const GLint *,
-                                                          const GLsizei *,
-                                                          GLsizei, GLint);
-#define CALL_MultiModeDrawArraysIBM(disp, parameters) \
-    (* GET_MultiModeDrawArraysIBM(disp)) parameters
-static inline _glptr_MultiModeDrawArraysIBM
-GET_MultiModeDrawArraysIBM(struct _glapi_table *disp)
-{
-    return (_glptr_MultiModeDrawArraysIBM) (GET_by_offset
-                                            (disp,
-                                             _gloffset_MultiModeDrawArraysIBM));
-}
-
-static inline void
-SET_MultiModeDrawArraysIBM(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (const GLenum *, const GLint *,
-                                                  const GLsizei *, GLsizei,
-                                                  GLint))
-{
-    SET_by_offset(disp, _gloffset_MultiModeDrawArraysIBM, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiModeDrawElementsIBM) (const GLenum *,
-                                                            const GLsizei *,
-                                                            GLenum,
-                                                            const GLvoid *
-                                                            const *, GLsizei,
-                                                            GLint);
-#define CALL_MultiModeDrawElementsIBM(disp, parameters) \
-    (* GET_MultiModeDrawElementsIBM(disp)) parameters
-static inline _glptr_MultiModeDrawElementsIBM
-GET_MultiModeDrawElementsIBM(struct _glapi_table *disp)
-{
-    return (_glptr_MultiModeDrawElementsIBM) (GET_by_offset
-                                              (disp,
-                                               _gloffset_MultiModeDrawElementsIBM));
-}
-
-static inline void
-SET_MultiModeDrawElementsIBM(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (const GLenum *,
-                                                    const GLsizei *, GLenum,
-                                                    const GLvoid * const *,
-                                                    GLsizei, GLint))
-{
-    SET_by_offset(disp, _gloffset_MultiModeDrawElementsIBM, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteFencesNV) (GLsizei, const GLuint *);
-
-#define CALL_DeleteFencesNV(disp, parameters) \
-    (* GET_DeleteFencesNV(disp)) parameters
-static inline _glptr_DeleteFencesNV
-GET_DeleteFencesNV(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteFencesNV) (GET_by_offset
-                                    (disp, _gloffset_DeleteFencesNV));
-}
-
-static inline void
-SET_DeleteFencesNV(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteFencesNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FinishFenceNV) (GLuint);
-
-#define CALL_FinishFenceNV(disp, parameters) \
-    (* GET_FinishFenceNV(disp)) parameters
-static inline _glptr_FinishFenceNV
-GET_FinishFenceNV(struct _glapi_table *disp)
-{
-    return (_glptr_FinishFenceNV) (GET_by_offset
-                                   (disp, _gloffset_FinishFenceNV));
-}
-
-static inline void
-SET_FinishFenceNV(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_FinishFenceNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenFencesNV) (GLsizei, GLuint *);
-
-#define CALL_GenFencesNV(disp, parameters) \
-    (* GET_GenFencesNV(disp)) parameters
-static inline _glptr_GenFencesNV
-GET_GenFencesNV(struct _glapi_table *disp)
-{
-    return (_glptr_GenFencesNV) (GET_by_offset(disp, _gloffset_GenFencesNV));
-}
-
-static inline void
-SET_GenFencesNV(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenFencesNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetFenceivNV) (GLuint, GLenum, GLint *);
-
-#define CALL_GetFenceivNV(disp, parameters) \
-    (* GET_GetFenceivNV(disp)) parameters
-static inline _glptr_GetFenceivNV
-GET_GetFenceivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetFenceivNV) (GET_by_offset(disp, _gloffset_GetFenceivNV));
-}
-
-static inline void
-SET_GetFenceivNV(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetFenceivNV, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsFenceNV) (GLuint);
-
-#define CALL_IsFenceNV(disp, parameters) \
-    (* GET_IsFenceNV(disp)) parameters
-static inline _glptr_IsFenceNV
-GET_IsFenceNV(struct _glapi_table *disp)
-{
-    return (_glptr_IsFenceNV) (GET_by_offset(disp, _gloffset_IsFenceNV));
-}
-
-static inline void
-SET_IsFenceNV(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsFenceNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SetFenceNV) (GLuint, GLenum);
-
-#define CALL_SetFenceNV(disp, parameters) \
-    (* GET_SetFenceNV(disp)) parameters
-static inline _glptr_SetFenceNV
-GET_SetFenceNV(struct _glapi_table *disp)
-{
-    return (_glptr_SetFenceNV) (GET_by_offset(disp, _gloffset_SetFenceNV));
-}
-
-static inline void
-SET_SetFenceNV(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_SetFenceNV, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_TestFenceNV) (GLuint);
-
-#define CALL_TestFenceNV(disp, parameters) \
-    (* GET_TestFenceNV(disp)) parameters
-static inline _glptr_TestFenceNV
-GET_TestFenceNV(struct _glapi_table *disp)
-{
-    return (_glptr_TestFenceNV) (GET_by_offset(disp, _gloffset_TestFenceNV));
-}
-
-static inline void
-SET_TestFenceNV(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_TestFenceNV, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_AreProgramsResidentNV) (GLsizei,
-                                                             const GLuint *,
-                                                             GLboolean *);
-#define CALL_AreProgramsResidentNV(disp, parameters) \
-    (* GET_AreProgramsResidentNV(disp)) parameters
-static inline _glptr_AreProgramsResidentNV
-GET_AreProgramsResidentNV(struct _glapi_table *disp)
-{
-    return (_glptr_AreProgramsResidentNV) (GET_by_offset
-                                           (disp,
-                                            _gloffset_AreProgramsResidentNV));
-}
-
-static inline void
-SET_AreProgramsResidentNV(struct _glapi_table *disp,
-                          GLboolean(GLAPIENTRYP fn) (GLsizei, const GLuint *,
-                                                     GLboolean *))
-{
-    SET_by_offset(disp, _gloffset_AreProgramsResidentNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindProgramNV) (GLenum, GLuint);
-
-#define CALL_BindProgramNV(disp, parameters) \
-    (* GET_BindProgramNV(disp)) parameters
-static inline _glptr_BindProgramNV
-GET_BindProgramNV(struct _glapi_table *disp)
-{
-    return (_glptr_BindProgramNV) (GET_by_offset
-                                   (disp, _gloffset_BindProgramNV));
-}
-
-static inline void
-SET_BindProgramNV(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindProgramNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteProgramsNV) (GLsizei, const GLuint *);
-
-#define CALL_DeleteProgramsNV(disp, parameters) \
-    (* GET_DeleteProgramsNV(disp)) parameters
-static inline _glptr_DeleteProgramsNV
-GET_DeleteProgramsNV(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteProgramsNV) (GET_by_offset
-                                      (disp, _gloffset_DeleteProgramsNV));
-}
-
-static inline void
-SET_DeleteProgramsNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteProgramsNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ExecuteProgramNV) (GLenum, GLuint,
-                                                    const GLfloat *);
-#define CALL_ExecuteProgramNV(disp, parameters) \
-    (* GET_ExecuteProgramNV(disp)) parameters
-static inline _glptr_ExecuteProgramNV
-GET_ExecuteProgramNV(struct _glapi_table *disp)
-{
-    return (_glptr_ExecuteProgramNV) (GET_by_offset
-                                      (disp, _gloffset_ExecuteProgramNV));
-}
-
-static inline void
-SET_ExecuteProgramNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ExecuteProgramNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenProgramsNV) (GLsizei, GLuint *);
-
-#define CALL_GenProgramsNV(disp, parameters) \
-    (* GET_GenProgramsNV(disp)) parameters
-static inline _glptr_GenProgramsNV
-GET_GenProgramsNV(struct _glapi_table *disp)
-{
-    return (_glptr_GenProgramsNV) (GET_by_offset
-                                   (disp, _gloffset_GenProgramsNV));
-}
-
-static inline void
-SET_GenProgramsNV(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenProgramsNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramParameterdvNV) (GLenum, GLuint,
-                                                           GLenum, GLdouble *);
-#define CALL_GetProgramParameterdvNV(disp, parameters) \
-    (* GET_GetProgramParameterdvNV(disp)) parameters
-static inline _glptr_GetProgramParameterdvNV
-GET_GetProgramParameterdvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramParameterdvNV) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetProgramParameterdvNV));
-}
-
-static inline void
-SET_GetProgramParameterdvNV(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLuint, GLenum,
-                                                   GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramParameterdvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramParameterfvNV) (GLenum, GLuint,
-                                                           GLenum, GLfloat *);
-#define CALL_GetProgramParameterfvNV(disp, parameters) \
-    (* GET_GetProgramParameterfvNV(disp)) parameters
-static inline _glptr_GetProgramParameterfvNV
-GET_GetProgramParameterfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramParameterfvNV) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetProgramParameterfvNV));
-}
-
-static inline void
-SET_GetProgramParameterfvNV(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLuint, GLenum,
-                                                   GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramParameterfvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramStringNV) (GLuint, GLenum,
-                                                      GLubyte *);
-#define CALL_GetProgramStringNV(disp, parameters) \
-    (* GET_GetProgramStringNV(disp)) parameters
-static inline _glptr_GetProgramStringNV
-GET_GetProgramStringNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramStringNV) (GET_by_offset
-                                        (disp, _gloffset_GetProgramStringNV));
-}
-
-static inline void
-SET_GetProgramStringNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLenum, GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramStringNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramivNV) (GLuint, GLenum, GLint *);
-
-#define CALL_GetProgramivNV(disp, parameters) \
-    (* GET_GetProgramivNV(disp)) parameters
-static inline _glptr_GetProgramivNV
-GET_GetProgramivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramivNV) (GET_by_offset
-                                    (disp, _gloffset_GetProgramivNV));
-}
-
-static inline void
-SET_GetProgramivNV(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramivNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTrackMatrixivNV) (GLenum, GLuint, GLenum,
-                                                      GLint *);
-#define CALL_GetTrackMatrixivNV(disp, parameters) \
-    (* GET_GetTrackMatrixivNV(disp)) parameters
-static inline _glptr_GetTrackMatrixivNV
-GET_GetTrackMatrixivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetTrackMatrixivNV) (GET_by_offset
-                                        (disp, _gloffset_GetTrackMatrixivNV));
-}
-
-static inline void
-SET_GetTrackMatrixivNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTrackMatrixivNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribPointervNV) (GLuint, GLenum,
-                                                             GLvoid **);
-#define CALL_GetVertexAttribPointervNV(disp, parameters) \
-    (* GET_GetVertexAttribPointervNV(disp)) parameters
-static inline _glptr_GetVertexAttribPointervNV
-GET_GetVertexAttribPointervNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribPointervNV) (GET_by_offset
-                                               (disp,
-                                                _gloffset_GetVertexAttribPointervNV));
-}
-
-static inline void
-SET_GetVertexAttribPointervNV(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLuint, GLenum, GLvoid **))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribPointervNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribdvNV) (GLuint, GLenum,
-                                                       GLdouble *);
-#define CALL_GetVertexAttribdvNV(disp, parameters) \
-    (* GET_GetVertexAttribdvNV(disp)) parameters
-static inline _glptr_GetVertexAttribdvNV
-GET_GetVertexAttribdvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribdvNV) (GET_by_offset
-                                         (disp, _gloffset_GetVertexAttribdvNV));
-}
-
-static inline void
-SET_GetVertexAttribdvNV(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribdvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribfvNV) (GLuint, GLenum,
-                                                       GLfloat *);
-#define CALL_GetVertexAttribfvNV(disp, parameters) \
-    (* GET_GetVertexAttribfvNV(disp)) parameters
-static inline _glptr_GetVertexAttribfvNV
-GET_GetVertexAttribfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribfvNV) (GET_by_offset
-                                         (disp, _gloffset_GetVertexAttribfvNV));
-}
-
-static inline void
-SET_GetVertexAttribfvNV(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribfvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribivNV) (GLuint, GLenum, GLint *);
-
-#define CALL_GetVertexAttribivNV(disp, parameters) \
-    (* GET_GetVertexAttribivNV(disp)) parameters
-static inline _glptr_GetVertexAttribivNV
-GET_GetVertexAttribivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribivNV) (GET_by_offset
-                                         (disp, _gloffset_GetVertexAttribivNV));
-}
-
-static inline void
-SET_GetVertexAttribivNV(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribivNV, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsProgramNV) (GLuint);
-
-#define CALL_IsProgramNV(disp, parameters) \
-    (* GET_IsProgramNV(disp)) parameters
-static inline _glptr_IsProgramNV
-GET_IsProgramNV(struct _glapi_table *disp)
-{
-    return (_glptr_IsProgramNV) (GET_by_offset(disp, _gloffset_IsProgramNV));
-}
-
-static inline void
-SET_IsProgramNV(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsProgramNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LoadProgramNV) (GLenum, GLuint, GLsizei,
-                                                 const GLubyte *);
-#define CALL_LoadProgramNV(disp, parameters) \
-    (* GET_LoadProgramNV(disp)) parameters
-static inline _glptr_LoadProgramNV
-GET_LoadProgramNV(struct _glapi_table *disp)
-{
-    return (_glptr_LoadProgramNV) (GET_by_offset
-                                   (disp, _gloffset_LoadProgramNV));
-}
-
-static inline void
-SET_LoadProgramNV(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLuint, GLsizei,
-                                         const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_LoadProgramNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramParameters4dvNV) (GLenum, GLuint,
-                                                          GLsizei,
-                                                          const GLdouble *);
-#define CALL_ProgramParameters4dvNV(disp, parameters) \
-    (* GET_ProgramParameters4dvNV(disp)) parameters
-static inline _glptr_ProgramParameters4dvNV
-GET_ProgramParameters4dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramParameters4dvNV) (GET_by_offset
-                                            (disp,
-                                             _gloffset_ProgramParameters4dvNV));
-}
-
-static inline void
-SET_ProgramParameters4dvNV(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLuint, GLsizei,
-                                                  const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_ProgramParameters4dvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramParameters4fvNV) (GLenum, GLuint,
-                                                          GLsizei,
-                                                          const GLfloat *);
-#define CALL_ProgramParameters4fvNV(disp, parameters) \
-    (* GET_ProgramParameters4fvNV(disp)) parameters
-static inline _glptr_ProgramParameters4fvNV
-GET_ProgramParameters4fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramParameters4fvNV) (GET_by_offset
-                                            (disp,
-                                             _gloffset_ProgramParameters4fvNV));
-}
-
-static inline void
-SET_ProgramParameters4fvNV(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLuint, GLsizei,
-                                                  const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ProgramParameters4fvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RequestResidentProgramsNV) (GLsizei,
-                                                             const GLuint *);
-#define CALL_RequestResidentProgramsNV(disp, parameters) \
-    (* GET_RequestResidentProgramsNV(disp)) parameters
-static inline _glptr_RequestResidentProgramsNV
-GET_RequestResidentProgramsNV(struct _glapi_table *disp)
-{
-    return (_glptr_RequestResidentProgramsNV) (GET_by_offset
-                                               (disp,
-                                                _gloffset_RequestResidentProgramsNV));
-}
-
-static inline void
-SET_RequestResidentProgramsNV(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_RequestResidentProgramsNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TrackMatrixNV) (GLenum, GLuint, GLenum,
-                                                 GLenum);
-#define CALL_TrackMatrixNV(disp, parameters) \
-    (* GET_TrackMatrixNV(disp)) parameters
-static inline _glptr_TrackMatrixNV
-GET_TrackMatrixNV(struct _glapi_table *disp)
-{
-    return (_glptr_TrackMatrixNV) (GET_by_offset
-                                   (disp, _gloffset_TrackMatrixNV));
-}
-
-static inline void
-SET_TrackMatrixNV(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLuint, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_TrackMatrixNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1dNV) (GLuint, GLdouble);
-
-#define CALL_VertexAttrib1dNV(disp, parameters) \
-    (* GET_VertexAttrib1dNV(disp)) parameters
-static inline _glptr_VertexAttrib1dNV
-GET_VertexAttrib1dNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1dNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib1dNV));
-}
-
-static inline void
-SET_VertexAttrib1dNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1dNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1dvNV) (GLuint, const GLdouble *);
-
-#define CALL_VertexAttrib1dvNV(disp, parameters) \
-    (* GET_VertexAttrib1dvNV(disp)) parameters
-static inline _glptr_VertexAttrib1dvNV
-GET_VertexAttrib1dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1dvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib1dvNV));
-}
-
-static inline void
-SET_VertexAttrib1dvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1dvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1fNV) (GLuint, GLfloat);
-
-#define CALL_VertexAttrib1fNV(disp, parameters) \
-    (* GET_VertexAttrib1fNV(disp)) parameters
-static inline _glptr_VertexAttrib1fNV
-GET_VertexAttrib1fNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1fNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib1fNV));
-}
-
-static inline void
-SET_VertexAttrib1fNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1fNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1fvNV) (GLuint, const GLfloat *);
-
-#define CALL_VertexAttrib1fvNV(disp, parameters) \
-    (* GET_VertexAttrib1fvNV(disp)) parameters
-static inline _glptr_VertexAttrib1fvNV
-GET_VertexAttrib1fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1fvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib1fvNV));
-}
-
-static inline void
-SET_VertexAttrib1fvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1fvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1sNV) (GLuint, GLshort);
-
-#define CALL_VertexAttrib1sNV(disp, parameters) \
-    (* GET_VertexAttrib1sNV(disp)) parameters
-static inline _glptr_VertexAttrib1sNV
-GET_VertexAttrib1sNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1sNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib1sNV));
-}
-
-static inline void
-SET_VertexAttrib1sNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1sNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1svNV) (GLuint, const GLshort *);
-
-#define CALL_VertexAttrib1svNV(disp, parameters) \
-    (* GET_VertexAttrib1svNV(disp)) parameters
-static inline _glptr_VertexAttrib1svNV
-GET_VertexAttrib1svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1svNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib1svNV));
-}
-
-static inline void
-SET_VertexAttrib1svNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1svNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2dNV) (GLuint, GLdouble, GLdouble);
-
-#define CALL_VertexAttrib2dNV(disp, parameters) \
-    (* GET_VertexAttrib2dNV(disp)) parameters
-static inline _glptr_VertexAttrib2dNV
-GET_VertexAttrib2dNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2dNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib2dNV));
-}
-
-static inline void
-SET_VertexAttrib2dNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2dNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2dvNV) (GLuint, const GLdouble *);
-
-#define CALL_VertexAttrib2dvNV(disp, parameters) \
-    (* GET_VertexAttrib2dvNV(disp)) parameters
-static inline _glptr_VertexAttrib2dvNV
-GET_VertexAttrib2dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2dvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib2dvNV));
-}
-
-static inline void
-SET_VertexAttrib2dvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2dvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2fNV) (GLuint, GLfloat, GLfloat);
-
-#define CALL_VertexAttrib2fNV(disp, parameters) \
-    (* GET_VertexAttrib2fNV(disp)) parameters
-static inline _glptr_VertexAttrib2fNV
-GET_VertexAttrib2fNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2fNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib2fNV));
-}
-
-static inline void
-SET_VertexAttrib2fNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2fNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2fvNV) (GLuint, const GLfloat *);
-
-#define CALL_VertexAttrib2fvNV(disp, parameters) \
-    (* GET_VertexAttrib2fvNV(disp)) parameters
-static inline _glptr_VertexAttrib2fvNV
-GET_VertexAttrib2fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2fvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib2fvNV));
-}
-
-static inline void
-SET_VertexAttrib2fvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2fvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2sNV) (GLuint, GLshort, GLshort);
-
-#define CALL_VertexAttrib2sNV(disp, parameters) \
-    (* GET_VertexAttrib2sNV(disp)) parameters
-static inline _glptr_VertexAttrib2sNV
-GET_VertexAttrib2sNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2sNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib2sNV));
-}
-
-static inline void
-SET_VertexAttrib2sNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2sNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2svNV) (GLuint, const GLshort *);
-
-#define CALL_VertexAttrib2svNV(disp, parameters) \
-    (* GET_VertexAttrib2svNV(disp)) parameters
-static inline _glptr_VertexAttrib2svNV
-GET_VertexAttrib2svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2svNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib2svNV));
-}
-
-static inline void
-SET_VertexAttrib2svNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2svNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3dNV) (GLuint, GLdouble, GLdouble,
-                                                    GLdouble);
-#define CALL_VertexAttrib3dNV(disp, parameters) \
-    (* GET_VertexAttrib3dNV(disp)) parameters
-static inline _glptr_VertexAttrib3dNV
-GET_VertexAttrib3dNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3dNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib3dNV));
-}
-
-static inline void
-SET_VertexAttrib3dNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLdouble, GLdouble,
-                                            GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3dNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3dvNV) (GLuint, const GLdouble *);
-
-#define CALL_VertexAttrib3dvNV(disp, parameters) \
-    (* GET_VertexAttrib3dvNV(disp)) parameters
-static inline _glptr_VertexAttrib3dvNV
-GET_VertexAttrib3dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3dvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib3dvNV));
-}
-
-static inline void
-SET_VertexAttrib3dvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3dvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3fNV) (GLuint, GLfloat, GLfloat,
-                                                    GLfloat);
-#define CALL_VertexAttrib3fNV(disp, parameters) \
-    (* GET_VertexAttrib3fNV(disp)) parameters
-static inline _glptr_VertexAttrib3fNV
-GET_VertexAttrib3fNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3fNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib3fNV));
-}
-
-static inline void
-SET_VertexAttrib3fNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3fNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3fvNV) (GLuint, const GLfloat *);
-
-#define CALL_VertexAttrib3fvNV(disp, parameters) \
-    (* GET_VertexAttrib3fvNV(disp)) parameters
-static inline _glptr_VertexAttrib3fvNV
-GET_VertexAttrib3fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3fvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib3fvNV));
-}
-
-static inline void
-SET_VertexAttrib3fvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3fvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3sNV) (GLuint, GLshort, GLshort,
-                                                    GLshort);
-#define CALL_VertexAttrib3sNV(disp, parameters) \
-    (* GET_VertexAttrib3sNV(disp)) parameters
-static inline _glptr_VertexAttrib3sNV
-GET_VertexAttrib3sNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3sNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib3sNV));
-}
-
-static inline void
-SET_VertexAttrib3sNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3sNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3svNV) (GLuint, const GLshort *);
-
-#define CALL_VertexAttrib3svNV(disp, parameters) \
-    (* GET_VertexAttrib3svNV(disp)) parameters
-static inline _glptr_VertexAttrib3svNV
-GET_VertexAttrib3svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3svNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib3svNV));
-}
-
-static inline void
-SET_VertexAttrib3svNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3svNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4dNV) (GLuint, GLdouble, GLdouble,
-                                                    GLdouble, GLdouble);
-#define CALL_VertexAttrib4dNV(disp, parameters) \
-    (* GET_VertexAttrib4dNV(disp)) parameters
-static inline _glptr_VertexAttrib4dNV
-GET_VertexAttrib4dNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4dNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib4dNV));
-}
-
-static inline void
-SET_VertexAttrib4dNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLdouble, GLdouble,
-                                            GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4dNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4dvNV) (GLuint, const GLdouble *);
-
-#define CALL_VertexAttrib4dvNV(disp, parameters) \
-    (* GET_VertexAttrib4dvNV(disp)) parameters
-static inline _glptr_VertexAttrib4dvNV
-GET_VertexAttrib4dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4dvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4dvNV));
-}
-
-static inline void
-SET_VertexAttrib4dvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4dvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4fNV) (GLuint, GLfloat, GLfloat,
-                                                    GLfloat, GLfloat);
-#define CALL_VertexAttrib4fNV(disp, parameters) \
-    (* GET_VertexAttrib4fNV(disp)) parameters
-static inline _glptr_VertexAttrib4fNV
-GET_VertexAttrib4fNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4fNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib4fNV));
-}
-
-static inline void
-SET_VertexAttrib4fNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLfloat, GLfloat, GLfloat,
-                                            GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4fNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4fvNV) (GLuint, const GLfloat *);
-
-#define CALL_VertexAttrib4fvNV(disp, parameters) \
-    (* GET_VertexAttrib4fvNV(disp)) parameters
-static inline _glptr_VertexAttrib4fvNV
-GET_VertexAttrib4fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4fvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4fvNV));
-}
-
-static inline void
-SET_VertexAttrib4fvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4fvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4sNV) (GLuint, GLshort, GLshort,
-                                                    GLshort, GLshort);
-#define CALL_VertexAttrib4sNV(disp, parameters) \
-    (* GET_VertexAttrib4sNV(disp)) parameters
-static inline _glptr_VertexAttrib4sNV
-GET_VertexAttrib4sNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4sNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib4sNV));
-}
-
-static inline void
-SET_VertexAttrib4sNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLshort, GLshort, GLshort,
-                                            GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4sNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4svNV) (GLuint, const GLshort *);
-
-#define CALL_VertexAttrib4svNV(disp, parameters) \
-    (* GET_VertexAttrib4svNV(disp)) parameters
-static inline _glptr_VertexAttrib4svNV
-GET_VertexAttrib4svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4svNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4svNV));
-}
-
-static inline void
-SET_VertexAttrib4svNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4svNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4ubNV) (GLuint, GLubyte, GLubyte,
-                                                     GLubyte, GLubyte);
-#define CALL_VertexAttrib4ubNV(disp, parameters) \
-    (* GET_VertexAttrib4ubNV(disp)) parameters
-static inline _glptr_VertexAttrib4ubNV
-GET_VertexAttrib4ubNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4ubNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4ubNV));
-}
-
-static inline void
-SET_VertexAttrib4ubNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLubyte, GLubyte, GLubyte,
-                                             GLubyte))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4ubNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4ubvNV) (GLuint, const GLubyte *);
-
-#define CALL_VertexAttrib4ubvNV(disp, parameters) \
-    (* GET_VertexAttrib4ubvNV(disp)) parameters
-static inline _glptr_VertexAttrib4ubvNV
-GET_VertexAttrib4ubvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4ubvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib4ubvNV));
-}
-
-static inline void
-SET_VertexAttrib4ubvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4ubvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribPointerNV) (GLuint, GLint, GLenum,
-                                                         GLsizei,
-                                                         const GLvoid *);
-#define CALL_VertexAttribPointerNV(disp, parameters) \
-    (* GET_VertexAttribPointerNV(disp)) parameters
-static inline _glptr_VertexAttribPointerNV
-GET_VertexAttribPointerNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribPointerNV) (GET_by_offset
-                                           (disp,
-                                            _gloffset_VertexAttribPointerNV));
-}
-
-static inline void
-SET_VertexAttribPointerNV(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint, GLint, GLenum, GLsizei,
-                                                 const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribPointerNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs1dvNV) (GLuint, GLsizei,
-                                                      const GLdouble *);
-#define CALL_VertexAttribs1dvNV(disp, parameters) \
-    (* GET_VertexAttribs1dvNV(disp)) parameters
-static inline _glptr_VertexAttribs1dvNV
-GET_VertexAttribs1dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs1dvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs1dvNV));
-}
-
-static inline void
-SET_VertexAttribs1dvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                              const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs1dvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs1fvNV) (GLuint, GLsizei,
-                                                      const GLfloat *);
-#define CALL_VertexAttribs1fvNV(disp, parameters) \
-    (* GET_VertexAttribs1fvNV(disp)) parameters
-static inline _glptr_VertexAttribs1fvNV
-GET_VertexAttribs1fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs1fvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs1fvNV));
-}
-
-static inline void
-SET_VertexAttribs1fvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs1fvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs1svNV) (GLuint, GLsizei,
-                                                      const GLshort *);
-#define CALL_VertexAttribs1svNV(disp, parameters) \
-    (* GET_VertexAttribs1svNV(disp)) parameters
-static inline _glptr_VertexAttribs1svNV
-GET_VertexAttribs1svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs1svNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs1svNV));
-}
-
-static inline void
-SET_VertexAttribs1svNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs1svNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs2dvNV) (GLuint, GLsizei,
-                                                      const GLdouble *);
-#define CALL_VertexAttribs2dvNV(disp, parameters) \
-    (* GET_VertexAttribs2dvNV(disp)) parameters
-static inline _glptr_VertexAttribs2dvNV
-GET_VertexAttribs2dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs2dvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs2dvNV));
-}
-
-static inline void
-SET_VertexAttribs2dvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                              const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs2dvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs2fvNV) (GLuint, GLsizei,
-                                                      const GLfloat *);
-#define CALL_VertexAttribs2fvNV(disp, parameters) \
-    (* GET_VertexAttribs2fvNV(disp)) parameters
-static inline _glptr_VertexAttribs2fvNV
-GET_VertexAttribs2fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs2fvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs2fvNV));
-}
-
-static inline void
-SET_VertexAttribs2fvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs2fvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs2svNV) (GLuint, GLsizei,
-                                                      const GLshort *);
-#define CALL_VertexAttribs2svNV(disp, parameters) \
-    (* GET_VertexAttribs2svNV(disp)) parameters
-static inline _glptr_VertexAttribs2svNV
-GET_VertexAttribs2svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs2svNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs2svNV));
-}
-
-static inline void
-SET_VertexAttribs2svNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs2svNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs3dvNV) (GLuint, GLsizei,
-                                                      const GLdouble *);
-#define CALL_VertexAttribs3dvNV(disp, parameters) \
-    (* GET_VertexAttribs3dvNV(disp)) parameters
-static inline _glptr_VertexAttribs3dvNV
-GET_VertexAttribs3dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs3dvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs3dvNV));
-}
-
-static inline void
-SET_VertexAttribs3dvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                              const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs3dvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs3fvNV) (GLuint, GLsizei,
-                                                      const GLfloat *);
-#define CALL_VertexAttribs3fvNV(disp, parameters) \
-    (* GET_VertexAttribs3fvNV(disp)) parameters
-static inline _glptr_VertexAttribs3fvNV
-GET_VertexAttribs3fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs3fvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs3fvNV));
-}
-
-static inline void
-SET_VertexAttribs3fvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs3fvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs3svNV) (GLuint, GLsizei,
-                                                      const GLshort *);
-#define CALL_VertexAttribs3svNV(disp, parameters) \
-    (* GET_VertexAttribs3svNV(disp)) parameters
-static inline _glptr_VertexAttribs3svNV
-GET_VertexAttribs3svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs3svNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs3svNV));
-}
-
-static inline void
-SET_VertexAttribs3svNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs3svNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs4dvNV) (GLuint, GLsizei,
-                                                      const GLdouble *);
-#define CALL_VertexAttribs4dvNV(disp, parameters) \
-    (* GET_VertexAttribs4dvNV(disp)) parameters
-static inline _glptr_VertexAttribs4dvNV
-GET_VertexAttribs4dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs4dvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs4dvNV));
-}
-
-static inline void
-SET_VertexAttribs4dvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                              const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs4dvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs4fvNV) (GLuint, GLsizei,
-                                                      const GLfloat *);
-#define CALL_VertexAttribs4fvNV(disp, parameters) \
-    (* GET_VertexAttribs4fvNV(disp)) parameters
-static inline _glptr_VertexAttribs4fvNV
-GET_VertexAttribs4fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs4fvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs4fvNV));
-}
-
-static inline void
-SET_VertexAttribs4fvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs4fvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs4svNV) (GLuint, GLsizei,
-                                                      const GLshort *);
-#define CALL_VertexAttribs4svNV(disp, parameters) \
-    (* GET_VertexAttribs4svNV(disp)) parameters
-static inline _glptr_VertexAttribs4svNV
-GET_VertexAttribs4svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs4svNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs4svNV));
-}
-
-static inline void
-SET_VertexAttribs4svNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs4svNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribs4ubvNV) (GLuint, GLsizei,
-                                                       const GLubyte *);
-#define CALL_VertexAttribs4ubvNV(disp, parameters) \
-    (* GET_VertexAttribs4ubvNV(disp)) parameters
-static inline _glptr_VertexAttribs4ubvNV
-GET_VertexAttribs4ubvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs4ubvNV) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribs4ubvNV));
-}
-
-static inline void
-SET_VertexAttribs4ubvNV(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                               const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs4ubvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexBumpParameterfvATI) (GLenum, GLfloat *);
-
-#define CALL_GetTexBumpParameterfvATI(disp, parameters) \
-    (* GET_GetTexBumpParameterfvATI(disp)) parameters
-static inline _glptr_GetTexBumpParameterfvATI
-GET_GetTexBumpParameterfvATI(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexBumpParameterfvATI) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetTexBumpParameterfvATI));
-}
-
-static inline void
-SET_GetTexBumpParameterfvATI(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetTexBumpParameterfvATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexBumpParameterivATI) (GLenum, GLint *);
-
-#define CALL_GetTexBumpParameterivATI(disp, parameters) \
-    (* GET_GetTexBumpParameterivATI(disp)) parameters
-static inline _glptr_GetTexBumpParameterivATI
-GET_GetTexBumpParameterivATI(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexBumpParameterivATI) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetTexBumpParameterivATI));
-}
-
-static inline void
-SET_GetTexBumpParameterivATI(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexBumpParameterivATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexBumpParameterfvATI) (GLenum,
-                                                         const GLfloat *);
-#define CALL_TexBumpParameterfvATI(disp, parameters) \
-    (* GET_TexBumpParameterfvATI(disp)) parameters
-static inline _glptr_TexBumpParameterfvATI
-GET_TexBumpParameterfvATI(struct _glapi_table *disp)
-{
-    return (_glptr_TexBumpParameterfvATI) (GET_by_offset
-                                           (disp,
-                                            _gloffset_TexBumpParameterfvATI));
-}
-
-static inline void
-SET_TexBumpParameterfvATI(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexBumpParameterfvATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexBumpParameterivATI) (GLenum, const GLint *);
-
-#define CALL_TexBumpParameterivATI(disp, parameters) \
-    (* GET_TexBumpParameterivATI(disp)) parameters
-static inline _glptr_TexBumpParameterivATI
-GET_TexBumpParameterivATI(struct _glapi_table *disp)
-{
-    return (_glptr_TexBumpParameterivATI) (GET_by_offset
-                                           (disp,
-                                            _gloffset_TexBumpParameterivATI));
-}
-
-static inline void
-SET_TexBumpParameterivATI(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexBumpParameterivATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp1ATI) (GLenum, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint);
-#define CALL_AlphaFragmentOp1ATI(disp, parameters) \
-    (* GET_AlphaFragmentOp1ATI(disp)) parameters
-static inline _glptr_AlphaFragmentOp1ATI
-GET_AlphaFragmentOp1ATI(struct _glapi_table *disp)
-{
-    return (_glptr_AlphaFragmentOp1ATI) (GET_by_offset
-                                         (disp, _gloffset_AlphaFragmentOp1ATI));
-}
-
-static inline void
-SET_AlphaFragmentOp1ATI(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_AlphaFragmentOp1ATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp2ATI) (GLenum, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint);
-#define CALL_AlphaFragmentOp2ATI(disp, parameters) \
-    (* GET_AlphaFragmentOp2ATI(disp)) parameters
-static inline _glptr_AlphaFragmentOp2ATI
-GET_AlphaFragmentOp2ATI(struct _glapi_table *disp)
-{
-    return (_glptr_AlphaFragmentOp2ATI) (GET_by_offset
-                                         (disp, _gloffset_AlphaFragmentOp2ATI));
-}
-
-static inline void
-SET_AlphaFragmentOp2ATI(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint, GLuint,
-                                               GLuint))
-{
-    SET_by_offset(disp, _gloffset_AlphaFragmentOp2ATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp3ATI) (GLenum, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint);
-#define CALL_AlphaFragmentOp3ATI(disp, parameters) \
-    (* GET_AlphaFragmentOp3ATI(disp)) parameters
-static inline _glptr_AlphaFragmentOp3ATI
-GET_AlphaFragmentOp3ATI(struct _glapi_table *disp)
-{
-    return (_glptr_AlphaFragmentOp3ATI) (GET_by_offset
-                                         (disp, _gloffset_AlphaFragmentOp3ATI));
-}
-
-static inline void
-SET_AlphaFragmentOp3ATI(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_AlphaFragmentOp3ATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BeginFragmentShaderATI) (void);
-
-#define CALL_BeginFragmentShaderATI(disp, parameters) \
-    (* GET_BeginFragmentShaderATI(disp)) parameters
-static inline _glptr_BeginFragmentShaderATI
-GET_BeginFragmentShaderATI(struct _glapi_table *disp)
-{
-    return (_glptr_BeginFragmentShaderATI) (GET_by_offset
-                                            (disp,
-                                             _gloffset_BeginFragmentShaderATI));
-}
-
-static inline void
-SET_BeginFragmentShaderATI(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_BeginFragmentShaderATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindFragmentShaderATI) (GLuint);
-
-#define CALL_BindFragmentShaderATI(disp, parameters) \
-    (* GET_BindFragmentShaderATI(disp)) parameters
-static inline _glptr_BindFragmentShaderATI
-GET_BindFragmentShaderATI(struct _glapi_table *disp)
-{
-    return (_glptr_BindFragmentShaderATI) (GET_by_offset
-                                           (disp,
-                                            _gloffset_BindFragmentShaderATI));
-}
-
-static inline void
-SET_BindFragmentShaderATI(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindFragmentShaderATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorFragmentOp1ATI) (GLenum, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint);
-#define CALL_ColorFragmentOp1ATI(disp, parameters) \
-    (* GET_ColorFragmentOp1ATI(disp)) parameters
-static inline _glptr_ColorFragmentOp1ATI
-GET_ColorFragmentOp1ATI(struct _glapi_table *disp)
-{
-    return (_glptr_ColorFragmentOp1ATI) (GET_by_offset
-                                         (disp, _gloffset_ColorFragmentOp1ATI));
-}
-
-static inline void
-SET_ColorFragmentOp1ATI(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_ColorFragmentOp1ATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorFragmentOp2ATI) (GLenum, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint);
-#define CALL_ColorFragmentOp2ATI(disp, parameters) \
-    (* GET_ColorFragmentOp2ATI(disp)) parameters
-static inline _glptr_ColorFragmentOp2ATI
-GET_ColorFragmentOp2ATI(struct _glapi_table *disp)
-{
-    return (_glptr_ColorFragmentOp2ATI) (GET_by_offset
-                                         (disp, _gloffset_ColorFragmentOp2ATI));
-}
-
-static inline void
-SET_ColorFragmentOp2ATI(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_ColorFragmentOp2ATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorFragmentOp3ATI) (GLenum, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint);
-#define CALL_ColorFragmentOp3ATI(disp, parameters) \
-    (* GET_ColorFragmentOp3ATI(disp)) parameters
-static inline _glptr_ColorFragmentOp3ATI
-GET_ColorFragmentOp3ATI(struct _glapi_table *disp)
-{
-    return (_glptr_ColorFragmentOp3ATI) (GET_by_offset
-                                         (disp, _gloffset_ColorFragmentOp3ATI));
-}
-
-static inline void
-SET_ColorFragmentOp3ATI(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint, GLuint,
-                                               GLuint))
-{
-    SET_by_offset(disp, _gloffset_ColorFragmentOp3ATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteFragmentShaderATI) (GLuint);
-
-#define CALL_DeleteFragmentShaderATI(disp, parameters) \
-    (* GET_DeleteFragmentShaderATI(disp)) parameters
-static inline _glptr_DeleteFragmentShaderATI
-GET_DeleteFragmentShaderATI(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteFragmentShaderATI) (GET_by_offset
-                                             (disp,
-                                              _gloffset_DeleteFragmentShaderATI));
-}
-
-static inline void
-SET_DeleteFragmentShaderATI(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_DeleteFragmentShaderATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EndFragmentShaderATI) (void);
-
-#define CALL_EndFragmentShaderATI(disp, parameters) \
-    (* GET_EndFragmentShaderATI(disp)) parameters
-static inline _glptr_EndFragmentShaderATI
-GET_EndFragmentShaderATI(struct _glapi_table *disp)
-{
-    return (_glptr_EndFragmentShaderATI) (GET_by_offset
-                                          (disp,
-                                           _gloffset_EndFragmentShaderATI));
-}
-
-static inline void
-SET_EndFragmentShaderATI(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_EndFragmentShaderATI, fn);
-}
-
-typedef GLuint(GLAPIENTRYP _glptr_GenFragmentShadersATI) (GLuint);
-
-#define CALL_GenFragmentShadersATI(disp, parameters) \
-    (* GET_GenFragmentShadersATI(disp)) parameters
-static inline _glptr_GenFragmentShadersATI
-GET_GenFragmentShadersATI(struct _glapi_table *disp)
-{
-    return (_glptr_GenFragmentShadersATI) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GenFragmentShadersATI));
-}
-
-static inline void
-SET_GenFragmentShadersATI(struct _glapi_table *disp,
-                          GLuint(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_GenFragmentShadersATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PassTexCoordATI) (GLuint, GLuint, GLenum);
-
-#define CALL_PassTexCoordATI(disp, parameters) \
-    (* GET_PassTexCoordATI(disp)) parameters
-static inline _glptr_PassTexCoordATI
-GET_PassTexCoordATI(struct _glapi_table *disp)
-{
-    return (_glptr_PassTexCoordATI) (GET_by_offset
-                                     (disp, _gloffset_PassTexCoordATI));
-}
-
-static inline void
-SET_PassTexCoordATI(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLuint, GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_PassTexCoordATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SampleMapATI) (GLuint, GLuint, GLenum);
-
-#define CALL_SampleMapATI(disp, parameters) \
-    (* GET_SampleMapATI(disp)) parameters
-static inline _glptr_SampleMapATI
-GET_SampleMapATI(struct _glapi_table *disp)
-{
-    return (_glptr_SampleMapATI) (GET_by_offset(disp, _gloffset_SampleMapATI));
-}
-
-static inline void
-SET_SampleMapATI(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLuint, GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_SampleMapATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SetFragmentShaderConstantATI) (GLuint,
-                                                                const GLfloat
-                                                                *);
-#define CALL_SetFragmentShaderConstantATI(disp, parameters) \
-    (* GET_SetFragmentShaderConstantATI(disp)) parameters
-static inline _glptr_SetFragmentShaderConstantATI
-GET_SetFragmentShaderConstantATI(struct _glapi_table *disp)
-{
-    return (_glptr_SetFragmentShaderConstantATI) (GET_by_offset
-                                                  (disp,
-                                                   _gloffset_SetFragmentShaderConstantATI));
-}
-
-static inline void
-SET_SetFragmentShaderConstantATI(struct _glapi_table *disp,
-                                 void (GLAPIENTRYP fn) (GLuint,
-                                                        const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_SetFragmentShaderConstantATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PointParameteriNV) (GLenum, GLint);
-
-#define CALL_PointParameteriNV(disp, parameters) \
-    (* GET_PointParameteriNV(disp)) parameters
-static inline _glptr_PointParameteriNV
-GET_PointParameteriNV(struct _glapi_table *disp)
-{
-    return (_glptr_PointParameteriNV) (GET_by_offset
-                                       (disp, _gloffset_PointParameteriNV));
-}
-
-static inline void
-SET_PointParameteriNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_PointParameteriNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PointParameterivNV) (GLenum, const GLint *);
-
-#define CALL_PointParameterivNV(disp, parameters) \
-    (* GET_PointParameterivNV(disp)) parameters
-static inline _glptr_PointParameterivNV
-GET_PointParameterivNV(struct _glapi_table *disp)
-{
-    return (_glptr_PointParameterivNV) (GET_by_offset
-                                        (disp, _gloffset_PointParameterivNV));
-}
-
-static inline void
-SET_PointParameterivNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_PointParameterivNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ActiveStencilFaceEXT) (GLenum);
-
-#define CALL_ActiveStencilFaceEXT(disp, parameters) \
-    (* GET_ActiveStencilFaceEXT(disp)) parameters
-static inline _glptr_ActiveStencilFaceEXT
-GET_ActiveStencilFaceEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ActiveStencilFaceEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_ActiveStencilFaceEXT));
-}
-
-static inline void
-SET_ActiveStencilFaceEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ActiveStencilFaceEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindVertexArrayAPPLE) (GLuint);
-
-#define CALL_BindVertexArrayAPPLE(disp, parameters) \
-    (* GET_BindVertexArrayAPPLE(disp)) parameters
-static inline _glptr_BindVertexArrayAPPLE
-GET_BindVertexArrayAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_BindVertexArrayAPPLE) (GET_by_offset
-                                          (disp,
-                                           _gloffset_BindVertexArrayAPPLE));
-}
-
-static inline void
-SET_BindVertexArrayAPPLE(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindVertexArrayAPPLE, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteVertexArraysAPPLE) (GLsizei,
-                                                           const GLuint *);
-#define CALL_DeleteVertexArraysAPPLE(disp, parameters) \
-    (* GET_DeleteVertexArraysAPPLE(disp)) parameters
-static inline _glptr_DeleteVertexArraysAPPLE
-GET_DeleteVertexArraysAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteVertexArraysAPPLE) (GET_by_offset
-                                             (disp,
-                                              _gloffset_DeleteVertexArraysAPPLE));
-}
-
-static inline void
-SET_DeleteVertexArraysAPPLE(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteVertexArraysAPPLE, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenVertexArraysAPPLE) (GLsizei, GLuint *);
-
-#define CALL_GenVertexArraysAPPLE(disp, parameters) \
-    (* GET_GenVertexArraysAPPLE(disp)) parameters
-static inline _glptr_GenVertexArraysAPPLE
-GET_GenVertexArraysAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_GenVertexArraysAPPLE) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GenVertexArraysAPPLE));
-}
-
-static inline void
-SET_GenVertexArraysAPPLE(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenVertexArraysAPPLE, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsVertexArrayAPPLE) (GLuint);
-
-#define CALL_IsVertexArrayAPPLE(disp, parameters) \
-    (* GET_IsVertexArrayAPPLE(disp)) parameters
-static inline _glptr_IsVertexArrayAPPLE
-GET_IsVertexArrayAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_IsVertexArrayAPPLE) (GET_by_offset
-                                        (disp, _gloffset_IsVertexArrayAPPLE));
-}
-
-static inline void
-SET_IsVertexArrayAPPLE(struct _glapi_table *disp,
-                       GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsVertexArrayAPPLE, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramNamedParameterdvNV) (GLuint, GLsizei,
-                                                                const GLubyte *,
-                                                                GLdouble *);
-#define CALL_GetProgramNamedParameterdvNV(disp, parameters) \
-    (* GET_GetProgramNamedParameterdvNV(disp)) parameters
-static inline _glptr_GetProgramNamedParameterdvNV
-GET_GetProgramNamedParameterdvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramNamedParameterdvNV) (GET_by_offset
-                                                  (disp,
-                                                   _gloffset_GetProgramNamedParameterdvNV));
-}
-
-static inline void
-SET_GetProgramNamedParameterdvNV(struct _glapi_table *disp,
-                                 void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                        const GLubyte *,
-                                                        GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramNamedParameterdvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramNamedParameterfvNV) (GLuint, GLsizei,
-                                                                const GLubyte *,
-                                                                GLfloat *);
-#define CALL_GetProgramNamedParameterfvNV(disp, parameters) \
-    (* GET_GetProgramNamedParameterfvNV(disp)) parameters
-static inline _glptr_GetProgramNamedParameterfvNV
-GET_GetProgramNamedParameterfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramNamedParameterfvNV) (GET_by_offset
-                                                  (disp,
-                                                   _gloffset_GetProgramNamedParameterfvNV));
-}
-
-static inline void
-SET_GetProgramNamedParameterfvNV(struct _glapi_table *disp,
-                                 void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                        const GLubyte *,
-                                                        GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramNamedParameterfvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4dNV) (GLuint, GLsizei,
-                                                             const GLubyte *,
-                                                             GLdouble, GLdouble,
-                                                             GLdouble,
-                                                             GLdouble);
-#define CALL_ProgramNamedParameter4dNV(disp, parameters) \
-    (* GET_ProgramNamedParameter4dNV(disp)) parameters
-static inline _glptr_ProgramNamedParameter4dNV
-GET_ProgramNamedParameter4dNV(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramNamedParameter4dNV) (GET_by_offset
-                                               (disp,
-                                                _gloffset_ProgramNamedParameter4dNV));
-}
-
-static inline void
-SET_ProgramNamedParameter4dNV(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                     const GLubyte *, GLdouble,
-                                                     GLdouble, GLdouble,
-                                                     GLdouble))
-{
-    SET_by_offset(disp, _gloffset_ProgramNamedParameter4dNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4dvNV) (GLuint, GLsizei,
-                                                              const GLubyte *,
-                                                              const GLdouble *);
-#define CALL_ProgramNamedParameter4dvNV(disp, parameters) \
-    (* GET_ProgramNamedParameter4dvNV(disp)) parameters
-static inline _glptr_ProgramNamedParameter4dvNV
-GET_ProgramNamedParameter4dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramNamedParameter4dvNV) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_ProgramNamedParameter4dvNV));
-}
-
-static inline void
-SET_ProgramNamedParameter4dvNV(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                      const GLubyte *,
-                                                      const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_ProgramNamedParameter4dvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4fNV) (GLuint, GLsizei,
-                                                             const GLubyte *,
-                                                             GLfloat, GLfloat,
-                                                             GLfloat, GLfloat);
-#define CALL_ProgramNamedParameter4fNV(disp, parameters) \
-    (* GET_ProgramNamedParameter4fNV(disp)) parameters
-static inline _glptr_ProgramNamedParameter4fNV
-GET_ProgramNamedParameter4fNV(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramNamedParameter4fNV) (GET_by_offset
-                                               (disp,
-                                                _gloffset_ProgramNamedParameter4fNV));
-}
-
-static inline void
-SET_ProgramNamedParameter4fNV(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                     const GLubyte *, GLfloat,
-                                                     GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_ProgramNamedParameter4fNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4fvNV) (GLuint, GLsizei,
-                                                              const GLubyte *,
-                                                              const GLfloat *);
-#define CALL_ProgramNamedParameter4fvNV(disp, parameters) \
-    (* GET_ProgramNamedParameter4fvNV(disp)) parameters
-static inline _glptr_ProgramNamedParameter4fvNV
-GET_ProgramNamedParameter4fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramNamedParameter4fvNV) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_ProgramNamedParameter4fvNV));
-}
-
-static inline void
-SET_ProgramNamedParameter4fvNV(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                      const GLubyte *,
-                                                      const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ProgramNamedParameter4fvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PrimitiveRestartIndexNV) (GLuint);
-
-#define CALL_PrimitiveRestartIndexNV(disp, parameters) \
-    (* GET_PrimitiveRestartIndexNV(disp)) parameters
-static inline _glptr_PrimitiveRestartIndexNV
-GET_PrimitiveRestartIndexNV(struct _glapi_table *disp)
-{
-    return (_glptr_PrimitiveRestartIndexNV) (GET_by_offset
-                                             (disp,
-                                              _gloffset_PrimitiveRestartIndexNV));
-}
-
-static inline void
-SET_PrimitiveRestartIndexNV(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_PrimitiveRestartIndexNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PrimitiveRestartNV) (void);
-
-#define CALL_PrimitiveRestartNV(disp, parameters) \
-    (* GET_PrimitiveRestartNV(disp)) parameters
-static inline _glptr_PrimitiveRestartNV
-GET_PrimitiveRestartNV(struct _glapi_table *disp)
-{
-    return (_glptr_PrimitiveRestartNV) (GET_by_offset
-                                        (disp, _gloffset_PrimitiveRestartNV));
-}
-
-static inline void
-SET_PrimitiveRestartNV(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PrimitiveRestartNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DepthBoundsEXT) (GLclampd, GLclampd);
-
-#define CALL_DepthBoundsEXT(disp, parameters) \
-    (* GET_DepthBoundsEXT(disp)) parameters
-static inline _glptr_DepthBoundsEXT
-GET_DepthBoundsEXT(struct _glapi_table *disp)
-{
-    return (_glptr_DepthBoundsEXT) (GET_by_offset
-                                    (disp, _gloffset_DepthBoundsEXT));
-}
-
-static inline void
-SET_DepthBoundsEXT(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLclampd, GLclampd))
-{
-    SET_by_offset(disp, _gloffset_DepthBoundsEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BlendEquationSeparateEXT) (GLenum, GLenum);
-
-#define CALL_BlendEquationSeparateEXT(disp, parameters) \
-    (* GET_BlendEquationSeparateEXT(disp)) parameters
-static inline _glptr_BlendEquationSeparateEXT
-GET_BlendEquationSeparateEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BlendEquationSeparateEXT) (GET_by_offset
-                                              (disp,
-                                               _gloffset_BlendEquationSeparateEXT));
-}
-
-static inline void
-SET_BlendEquationSeparateEXT(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendEquationSeparateEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindFramebufferEXT) (GLenum, GLuint);
-
-#define CALL_BindFramebufferEXT(disp, parameters) \
-    (* GET_BindFramebufferEXT(disp)) parameters
-static inline _glptr_BindFramebufferEXT
-GET_BindFramebufferEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BindFramebufferEXT) (GET_by_offset
-                                        (disp, _gloffset_BindFramebufferEXT));
-}
-
-static inline void
-SET_BindFramebufferEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindFramebufferEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindRenderbufferEXT) (GLenum, GLuint);
-
-#define CALL_BindRenderbufferEXT(disp, parameters) \
-    (* GET_BindRenderbufferEXT(disp)) parameters
-static inline _glptr_BindRenderbufferEXT
-GET_BindRenderbufferEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BindRenderbufferEXT) (GET_by_offset
-                                         (disp, _gloffset_BindRenderbufferEXT));
-}
-
-static inline void
-SET_BindRenderbufferEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindRenderbufferEXT, fn);
-}
-
-typedef GLenum(GLAPIENTRYP _glptr_CheckFramebufferStatusEXT) (GLenum);
-
-#define CALL_CheckFramebufferStatusEXT(disp, parameters) \
-    (* GET_CheckFramebufferStatusEXT(disp)) parameters
-static inline _glptr_CheckFramebufferStatusEXT
-GET_CheckFramebufferStatusEXT(struct _glapi_table *disp)
-{
-    return (_glptr_CheckFramebufferStatusEXT) (GET_by_offset
-                                               (disp,
-                                                _gloffset_CheckFramebufferStatusEXT));
-}
-
-static inline void
-SET_CheckFramebufferStatusEXT(struct _glapi_table *disp,
-                              GLenum(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_CheckFramebufferStatusEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteFramebuffersEXT) (GLsizei,
-                                                         const GLuint *);
-#define CALL_DeleteFramebuffersEXT(disp, parameters) \
-    (* GET_DeleteFramebuffersEXT(disp)) parameters
-static inline _glptr_DeleteFramebuffersEXT
-GET_DeleteFramebuffersEXT(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteFramebuffersEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_DeleteFramebuffersEXT));
-}
-
-static inline void
-SET_DeleteFramebuffersEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteFramebuffersEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteRenderbuffersEXT) (GLsizei,
-                                                          const GLuint *);
-#define CALL_DeleteRenderbuffersEXT(disp, parameters) \
-    (* GET_DeleteRenderbuffersEXT(disp)) parameters
-static inline _glptr_DeleteRenderbuffersEXT
-GET_DeleteRenderbuffersEXT(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteRenderbuffersEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_DeleteRenderbuffersEXT));
-}
-
-static inline void
-SET_DeleteRenderbuffersEXT(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteRenderbuffersEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferRenderbufferEXT) (GLenum, GLenum,
-                                                              GLenum, GLuint);
-#define CALL_FramebufferRenderbufferEXT(disp, parameters) \
-    (* GET_FramebufferRenderbufferEXT(disp)) parameters
-static inline _glptr_FramebufferRenderbufferEXT
-GET_FramebufferRenderbufferEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferRenderbufferEXT) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_FramebufferRenderbufferEXT));
-}
-
-static inline void
-SET_FramebufferRenderbufferEXT(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                      GLuint))
-{
-    SET_by_offset(disp, _gloffset_FramebufferRenderbufferEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferTexture1DEXT) (GLenum, GLenum,
-                                                           GLenum, GLuint,
-                                                           GLint);
-#define CALL_FramebufferTexture1DEXT(disp, parameters) \
-    (* GET_FramebufferTexture1DEXT(disp)) parameters
-static inline _glptr_FramebufferTexture1DEXT
-GET_FramebufferTexture1DEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTexture1DEXT) (GET_by_offset
-                                             (disp,
-                                              _gloffset_FramebufferTexture1DEXT));
-}
-
-static inline void
-SET_FramebufferTexture1DEXT(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                   GLuint, GLint))
-{
-    SET_by_offset(disp, _gloffset_FramebufferTexture1DEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferTexture2DEXT) (GLenum, GLenum,
-                                                           GLenum, GLuint,
-                                                           GLint);
-#define CALL_FramebufferTexture2DEXT(disp, parameters) \
-    (* GET_FramebufferTexture2DEXT(disp)) parameters
-static inline _glptr_FramebufferTexture2DEXT
-GET_FramebufferTexture2DEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTexture2DEXT) (GET_by_offset
-                                             (disp,
-                                              _gloffset_FramebufferTexture2DEXT));
-}
-
-static inline void
-SET_FramebufferTexture2DEXT(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                   GLuint, GLint))
-{
-    SET_by_offset(disp, _gloffset_FramebufferTexture2DEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferTexture3DEXT) (GLenum, GLenum,
-                                                           GLenum, GLuint,
-                                                           GLint, GLint);
-#define CALL_FramebufferTexture3DEXT(disp, parameters) \
-    (* GET_FramebufferTexture3DEXT(disp)) parameters
-static inline _glptr_FramebufferTexture3DEXT
-GET_FramebufferTexture3DEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTexture3DEXT) (GET_by_offset
-                                             (disp,
-                                              _gloffset_FramebufferTexture3DEXT));
-}
-
-static inline void
-SET_FramebufferTexture3DEXT(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                   GLuint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_FramebufferTexture3DEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenFramebuffersEXT) (GLsizei, GLuint *);
-
-#define CALL_GenFramebuffersEXT(disp, parameters) \
-    (* GET_GenFramebuffersEXT(disp)) parameters
-static inline _glptr_GenFramebuffersEXT
-GET_GenFramebuffersEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GenFramebuffersEXT) (GET_by_offset
-                                        (disp, _gloffset_GenFramebuffersEXT));
-}
-
-static inline void
-SET_GenFramebuffersEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenFramebuffersEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenRenderbuffersEXT) (GLsizei, GLuint *);
-
-#define CALL_GenRenderbuffersEXT(disp, parameters) \
-    (* GET_GenRenderbuffersEXT(disp)) parameters
-static inline _glptr_GenRenderbuffersEXT
-GET_GenRenderbuffersEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GenRenderbuffersEXT) (GET_by_offset
-                                         (disp, _gloffset_GenRenderbuffersEXT));
-}
-
-static inline void
-SET_GenRenderbuffersEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenRenderbuffersEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenerateMipmapEXT) (GLenum);
-
-#define CALL_GenerateMipmapEXT(disp, parameters) \
-    (* GET_GenerateMipmapEXT(disp)) parameters
-static inline _glptr_GenerateMipmapEXT
-GET_GenerateMipmapEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GenerateMipmapEXT) (GET_by_offset
-                                       (disp, _gloffset_GenerateMipmapEXT));
-}
-
-static inline void
-SET_GenerateMipmapEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_GenerateMipmapEXT, fn);
-}
-
-typedef void (GLAPIENTRYP
-              _glptr_GetFramebufferAttachmentParameterivEXT) (GLenum, GLenum,
-                                                              GLenum, GLint *);
-#define CALL_GetFramebufferAttachmentParameterivEXT(disp, parameters) \
-    (* GET_GetFramebufferAttachmentParameterivEXT(disp)) parameters
-static inline _glptr_GetFramebufferAttachmentParameterivEXT
-GET_GetFramebufferAttachmentParameterivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetFramebufferAttachmentParameterivEXT) (GET_by_offset
-                                                            (disp,
-                                                             _gloffset_GetFramebufferAttachmentParameterivEXT));
-}
-
-static inline void
-SET_GetFramebufferAttachmentParameterivEXT(struct _glapi_table *disp,
-                                           void (GLAPIENTRYP fn) (GLenum,
-                                                                  GLenum,
-                                                                  GLenum,
-                                                                  GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetFramebufferAttachmentParameterivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetRenderbufferParameterivEXT) (GLenum, GLenum,
-                                                                 GLint *);
-#define CALL_GetRenderbufferParameterivEXT(disp, parameters) \
-    (* GET_GetRenderbufferParameterivEXT(disp)) parameters
-static inline _glptr_GetRenderbufferParameterivEXT
-GET_GetRenderbufferParameterivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetRenderbufferParameterivEXT) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetRenderbufferParameterivEXT));
-}
-
-static inline void
-SET_GetRenderbufferParameterivEXT(struct _glapi_table *disp,
-                                  void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                         GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetRenderbufferParameterivEXT, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsFramebufferEXT) (GLuint);
-
-#define CALL_IsFramebufferEXT(disp, parameters) \
-    (* GET_IsFramebufferEXT(disp)) parameters
-static inline _glptr_IsFramebufferEXT
-GET_IsFramebufferEXT(struct _glapi_table *disp)
-{
-    return (_glptr_IsFramebufferEXT) (GET_by_offset
-                                      (disp, _gloffset_IsFramebufferEXT));
-}
-
-static inline void
-SET_IsFramebufferEXT(struct _glapi_table *disp,
-                     GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsFramebufferEXT, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsRenderbufferEXT) (GLuint);
-
-#define CALL_IsRenderbufferEXT(disp, parameters) \
-    (* GET_IsRenderbufferEXT(disp)) parameters
-static inline _glptr_IsRenderbufferEXT
-GET_IsRenderbufferEXT(struct _glapi_table *disp)
-{
-    return (_glptr_IsRenderbufferEXT) (GET_by_offset
-                                       (disp, _gloffset_IsRenderbufferEXT));
-}
-
-static inline void
-SET_IsRenderbufferEXT(struct _glapi_table *disp,
-                      GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsRenderbufferEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RenderbufferStorageEXT) (GLenum, GLenum,
-                                                          GLsizei, GLsizei);
-#define CALL_RenderbufferStorageEXT(disp, parameters) \
-    (* GET_RenderbufferStorageEXT(disp)) parameters
-static inline _glptr_RenderbufferStorageEXT
-GET_RenderbufferStorageEXT(struct _glapi_table *disp)
-{
-    return (_glptr_RenderbufferStorageEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_RenderbufferStorageEXT));
-}
-
-static inline void
-SET_RenderbufferStorageEXT(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei,
-                                                  GLsizei))
-{
-    SET_by_offset(disp, _gloffset_RenderbufferStorageEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BlitFramebufferEXT) (GLint, GLint, GLint,
-                                                      GLint, GLint, GLint,
-                                                      GLint, GLint, GLbitfield,
-                                                      GLenum);
-#define CALL_BlitFramebufferEXT(disp, parameters) \
-    (* GET_BlitFramebufferEXT(disp)) parameters
-static inline _glptr_BlitFramebufferEXT
-GET_BlitFramebufferEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BlitFramebufferEXT) (GET_by_offset
-                                        (disp, _gloffset_BlitFramebufferEXT));
-}
-
-static inline void
-SET_BlitFramebufferEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint, GLint,
-                                              GLint, GLint, GLint, GLbitfield,
-                                              GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlitFramebufferEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BufferParameteriAPPLE) (GLenum, GLenum, GLint);
-
-#define CALL_BufferParameteriAPPLE(disp, parameters) \
-    (* GET_BufferParameteriAPPLE(disp)) parameters
-static inline _glptr_BufferParameteriAPPLE
-GET_BufferParameteriAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_BufferParameteriAPPLE) (GET_by_offset
-                                           (disp,
-                                            _gloffset_BufferParameteriAPPLE));
-}
-
-static inline void
-SET_BufferParameteriAPPLE(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_BufferParameteriAPPLE, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FlushMappedBufferRangeAPPLE) (GLenum, GLintptr,
-                                                               GLsizeiptr);
-#define CALL_FlushMappedBufferRangeAPPLE(disp, parameters) \
-    (* GET_FlushMappedBufferRangeAPPLE(disp)) parameters
-static inline _glptr_FlushMappedBufferRangeAPPLE
-GET_FlushMappedBufferRangeAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_FlushMappedBufferRangeAPPLE) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_FlushMappedBufferRangeAPPLE));
-}
-
-static inline void
-SET_FlushMappedBufferRangeAPPLE(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLenum, GLintptr,
-                                                       GLsizeiptr))
-{
-    SET_by_offset(disp, _gloffset_FlushMappedBufferRangeAPPLE, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindFragDataLocationEXT) (GLuint, GLuint,
-                                                           const GLchar *);
-#define CALL_BindFragDataLocationEXT(disp, parameters) \
-    (* GET_BindFragDataLocationEXT(disp)) parameters
-static inline _glptr_BindFragDataLocationEXT
-GET_BindFragDataLocationEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BindFragDataLocationEXT) (GET_by_offset
-                                             (disp,
-                                              _gloffset_BindFragDataLocationEXT));
-}
-
-static inline void
-SET_BindFragDataLocationEXT(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLuint, GLuint,
-                                                   const GLchar *))
-{
-    SET_by_offset(disp, _gloffset_BindFragDataLocationEXT, fn);
-}
-
-typedef GLint(GLAPIENTRYP _glptr_GetFragDataLocationEXT) (GLuint,
-                                                          const GLchar *);
-#define CALL_GetFragDataLocationEXT(disp, parameters) \
-    (* GET_GetFragDataLocationEXT(disp)) parameters
-static inline _glptr_GetFragDataLocationEXT
-GET_GetFragDataLocationEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetFragDataLocationEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetFragDataLocationEXT));
-}
-
-static inline void
-SET_GetFragDataLocationEXT(struct _glapi_table *disp,
-                           GLint(GLAPIENTRYP fn) (GLuint, const GLchar *))
-{
-    SET_by_offset(disp, _gloffset_GetFragDataLocationEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetUniformuivEXT) (GLuint, GLint, GLuint *);
-
-#define CALL_GetUniformuivEXT(disp, parameters) \
-    (* GET_GetUniformuivEXT(disp)) parameters
-static inline _glptr_GetUniformuivEXT
-GET_GetUniformuivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetUniformuivEXT) (GET_by_offset
-                                      (disp, _gloffset_GetUniformuivEXT));
-}
-
-static inline void
-SET_GetUniformuivEXT(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLint, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetUniformuivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribIivEXT) (GLuint, GLenum,
-                                                         GLint *);
-#define CALL_GetVertexAttribIivEXT(disp, parameters) \
-    (* GET_GetVertexAttribIivEXT(disp)) parameters
-static inline _glptr_GetVertexAttribIivEXT
-GET_GetVertexAttribIivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribIivEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetVertexAttribIivEXT));
-}
-
-static inline void
-SET_GetVertexAttribIivEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribIivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribIuivEXT) (GLuint, GLenum,
-                                                          GLuint *);
-#define CALL_GetVertexAttribIuivEXT(disp, parameters) \
-    (* GET_GetVertexAttribIuivEXT(disp)) parameters
-static inline _glptr_GetVertexAttribIuivEXT
-GET_GetVertexAttribIuivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribIuivEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetVertexAttribIuivEXT));
-}
-
-static inline void
-SET_GetVertexAttribIuivEXT(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLuint, GLenum, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribIuivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform1uiEXT) (GLint, GLuint);
-
-#define CALL_Uniform1uiEXT(disp, parameters) \
-    (* GET_Uniform1uiEXT(disp)) parameters
-static inline _glptr_Uniform1uiEXT
-GET_Uniform1uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform1uiEXT) (GET_by_offset
-                                   (disp, _gloffset_Uniform1uiEXT));
-}
-
-static inline void
-SET_Uniform1uiEXT(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_Uniform1uiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform1uivEXT) (GLint, GLsizei,
-                                                  const GLuint *);
-#define CALL_Uniform1uivEXT(disp, parameters) \
-    (* GET_Uniform1uivEXT(disp)) parameters
-static inline _glptr_Uniform1uivEXT
-GET_Uniform1uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform1uivEXT) (GET_by_offset
-                                    (disp, _gloffset_Uniform1uivEXT));
-}
-
-static inline void
-SET_Uniform1uivEXT(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLint, GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform1uivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform2uiEXT) (GLint, GLuint, GLuint);
-
-#define CALL_Uniform2uiEXT(disp, parameters) \
-    (* GET_Uniform2uiEXT(disp)) parameters
-static inline _glptr_Uniform2uiEXT
-GET_Uniform2uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform2uiEXT) (GET_by_offset
-                                   (disp, _gloffset_Uniform2uiEXT));
-}
-
-static inline void
-SET_Uniform2uiEXT(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_Uniform2uiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform2uivEXT) (GLint, GLsizei,
-                                                  const GLuint *);
-#define CALL_Uniform2uivEXT(disp, parameters) \
-    (* GET_Uniform2uivEXT(disp)) parameters
-static inline _glptr_Uniform2uivEXT
-GET_Uniform2uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform2uivEXT) (GET_by_offset
-                                    (disp, _gloffset_Uniform2uivEXT));
-}
-
-static inline void
-SET_Uniform2uivEXT(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLint, GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform2uivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform3uiEXT) (GLint, GLuint, GLuint, GLuint);
-
-#define CALL_Uniform3uiEXT(disp, parameters) \
-    (* GET_Uniform3uiEXT(disp)) parameters
-static inline _glptr_Uniform3uiEXT
-GET_Uniform3uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform3uiEXT) (GET_by_offset
-                                   (disp, _gloffset_Uniform3uiEXT));
-}
-
-static inline void
-SET_Uniform3uiEXT(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_Uniform3uiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform3uivEXT) (GLint, GLsizei,
-                                                  const GLuint *);
-#define CALL_Uniform3uivEXT(disp, parameters) \
-    (* GET_Uniform3uivEXT(disp)) parameters
-static inline _glptr_Uniform3uivEXT
-GET_Uniform3uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform3uivEXT) (GET_by_offset
-                                    (disp, _gloffset_Uniform3uivEXT));
-}
-
-static inline void
-SET_Uniform3uivEXT(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLint, GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform3uivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform4uiEXT) (GLint, GLuint, GLuint, GLuint,
-                                                 GLuint);
-#define CALL_Uniform4uiEXT(disp, parameters) \
-    (* GET_Uniform4uiEXT(disp)) parameters
-static inline _glptr_Uniform4uiEXT
-GET_Uniform4uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform4uiEXT) (GET_by_offset
-                                   (disp, _gloffset_Uniform4uiEXT));
-}
-
-static inline void
-SET_Uniform4uiEXT(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLuint, GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_Uniform4uiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform4uivEXT) (GLint, GLsizei,
-                                                  const GLuint *);
-#define CALL_Uniform4uivEXT(disp, parameters) \
-    (* GET_Uniform4uivEXT(disp)) parameters
-static inline _glptr_Uniform4uivEXT
-GET_Uniform4uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform4uivEXT) (GET_by_offset
-                                    (disp, _gloffset_Uniform4uivEXT));
-}
-
-static inline void
-SET_Uniform4uivEXT(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLint, GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform4uivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI1iEXT) (GLuint, GLint);
-
-#define CALL_VertexAttribI1iEXT(disp, parameters) \
-    (* GET_VertexAttribI1iEXT(disp)) parameters
-static inline _glptr_VertexAttribI1iEXT
-GET_VertexAttribI1iEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI1iEXT) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribI1iEXT));
-}
-
-static inline void
-SET_VertexAttribI1iEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI1iEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI1ivEXT) (GLuint, const GLint *);
-
-#define CALL_VertexAttribI1ivEXT(disp, parameters) \
-    (* GET_VertexAttribI1ivEXT(disp)) parameters
-static inline _glptr_VertexAttribI1ivEXT
-GET_VertexAttribI1ivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI1ivEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI1ivEXT));
-}
-
-static inline void
-SET_VertexAttribI1ivEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI1ivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI1uiEXT) (GLuint, GLuint);
-
-#define CALL_VertexAttribI1uiEXT(disp, parameters) \
-    (* GET_VertexAttribI1uiEXT(disp)) parameters
-static inline _glptr_VertexAttribI1uiEXT
-GET_VertexAttribI1uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI1uiEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI1uiEXT));
-}
-
-static inline void
-SET_VertexAttribI1uiEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI1uiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI1uivEXT) (GLuint, const GLuint *);
-
-#define CALL_VertexAttribI1uivEXT(disp, parameters) \
-    (* GET_VertexAttribI1uivEXT(disp)) parameters
-static inline _glptr_VertexAttribI1uivEXT
-GET_VertexAttribI1uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI1uivEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttribI1uivEXT));
-}
-
-static inline void
-SET_VertexAttribI1uivEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI1uivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI2iEXT) (GLuint, GLint, GLint);
-
-#define CALL_VertexAttribI2iEXT(disp, parameters) \
-    (* GET_VertexAttribI2iEXT(disp)) parameters
-static inline _glptr_VertexAttribI2iEXT
-GET_VertexAttribI2iEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI2iEXT) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribI2iEXT));
-}
-
-static inline void
-SET_VertexAttribI2iEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI2iEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI2ivEXT) (GLuint, const GLint *);
-
-#define CALL_VertexAttribI2ivEXT(disp, parameters) \
-    (* GET_VertexAttribI2ivEXT(disp)) parameters
-static inline _glptr_VertexAttribI2ivEXT
-GET_VertexAttribI2ivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI2ivEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI2ivEXT));
-}
-
-static inline void
-SET_VertexAttribI2ivEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI2ivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI2uiEXT) (GLuint, GLuint, GLuint);
-
-#define CALL_VertexAttribI2uiEXT(disp, parameters) \
-    (* GET_VertexAttribI2uiEXT(disp)) parameters
-static inline _glptr_VertexAttribI2uiEXT
-GET_VertexAttribI2uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI2uiEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI2uiEXT));
-}
-
-static inline void
-SET_VertexAttribI2uiEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI2uiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI2uivEXT) (GLuint, const GLuint *);
-
-#define CALL_VertexAttribI2uivEXT(disp, parameters) \
-    (* GET_VertexAttribI2uivEXT(disp)) parameters
-static inline _glptr_VertexAttribI2uivEXT
-GET_VertexAttribI2uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI2uivEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttribI2uivEXT));
-}
-
-static inline void
-SET_VertexAttribI2uivEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI2uivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI3iEXT) (GLuint, GLint, GLint,
-                                                      GLint);
-#define CALL_VertexAttribI3iEXT(disp, parameters) \
-    (* GET_VertexAttribI3iEXT(disp)) parameters
-static inline _glptr_VertexAttribI3iEXT
-GET_VertexAttribI3iEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI3iEXT) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribI3iEXT));
-}
-
-static inline void
-SET_VertexAttribI3iEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI3iEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI3ivEXT) (GLuint, const GLint *);
-
-#define CALL_VertexAttribI3ivEXT(disp, parameters) \
-    (* GET_VertexAttribI3ivEXT(disp)) parameters
-static inline _glptr_VertexAttribI3ivEXT
-GET_VertexAttribI3ivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI3ivEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI3ivEXT));
-}
-
-static inline void
-SET_VertexAttribI3ivEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI3ivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI3uiEXT) (GLuint, GLuint, GLuint,
-                                                       GLuint);
-#define CALL_VertexAttribI3uiEXT(disp, parameters) \
-    (* GET_VertexAttribI3uiEXT(disp)) parameters
-static inline _glptr_VertexAttribI3uiEXT
-GET_VertexAttribI3uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI3uiEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI3uiEXT));
-}
-
-static inline void
-SET_VertexAttribI3uiEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI3uiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI3uivEXT) (GLuint, const GLuint *);
-
-#define CALL_VertexAttribI3uivEXT(disp, parameters) \
-    (* GET_VertexAttribI3uivEXT(disp)) parameters
-static inline _glptr_VertexAttribI3uivEXT
-GET_VertexAttribI3uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI3uivEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttribI3uivEXT));
-}
-
-static inline void
-SET_VertexAttribI3uivEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI3uivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4bvEXT) (GLuint, const GLbyte *);
-
-#define CALL_VertexAttribI4bvEXT(disp, parameters) \
-    (* GET_VertexAttribI4bvEXT(disp)) parameters
-static inline _glptr_VertexAttribI4bvEXT
-GET_VertexAttribI4bvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4bvEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI4bvEXT));
-}
-
-static inline void
-SET_VertexAttribI4bvEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4bvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4iEXT) (GLuint, GLint, GLint,
-                                                      GLint, GLint);
-#define CALL_VertexAttribI4iEXT(disp, parameters) \
-    (* GET_VertexAttribI4iEXT(disp)) parameters
-static inline _glptr_VertexAttribI4iEXT
-GET_VertexAttribI4iEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4iEXT) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribI4iEXT));
-}
-
-static inline void
-SET_VertexAttribI4iEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLint, GLint, GLint,
-                                              GLint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4iEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4ivEXT) (GLuint, const GLint *);
-
-#define CALL_VertexAttribI4ivEXT(disp, parameters) \
-    (* GET_VertexAttribI4ivEXT(disp)) parameters
-static inline _glptr_VertexAttribI4ivEXT
-GET_VertexAttribI4ivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4ivEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI4ivEXT));
-}
-
-static inline void
-SET_VertexAttribI4ivEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4ivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4svEXT) (GLuint, const GLshort *);
-
-#define CALL_VertexAttribI4svEXT(disp, parameters) \
-    (* GET_VertexAttribI4svEXT(disp)) parameters
-static inline _glptr_VertexAttribI4svEXT
-GET_VertexAttribI4svEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4svEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI4svEXT));
-}
-
-static inline void
-SET_VertexAttribI4svEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4svEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4ubvEXT) (GLuint,
-                                                        const GLubyte *);
-#define CALL_VertexAttribI4ubvEXT(disp, parameters) \
-    (* GET_VertexAttribI4ubvEXT(disp)) parameters
-static inline _glptr_VertexAttribI4ubvEXT
-GET_VertexAttribI4ubvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4ubvEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttribI4ubvEXT));
-}
-
-static inline void
-SET_VertexAttribI4ubvEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4ubvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4uiEXT) (GLuint, GLuint, GLuint,
-                                                       GLuint, GLuint);
-#define CALL_VertexAttribI4uiEXT(disp, parameters) \
-    (* GET_VertexAttribI4uiEXT(disp)) parameters
-static inline _glptr_VertexAttribI4uiEXT
-GET_VertexAttribI4uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4uiEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI4uiEXT));
-}
-
-static inline void
-SET_VertexAttribI4uiEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint, GLuint,
-                                               GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4uiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4uivEXT) (GLuint, const GLuint *);
-
-#define CALL_VertexAttribI4uivEXT(disp, parameters) \
-    (* GET_VertexAttribI4uivEXT(disp)) parameters
-static inline _glptr_VertexAttribI4uivEXT
-GET_VertexAttribI4uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4uivEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttribI4uivEXT));
-}
-
-static inline void
-SET_VertexAttribI4uivEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4uivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4usvEXT) (GLuint,
-                                                        const GLushort *);
-#define CALL_VertexAttribI4usvEXT(disp, parameters) \
-    (* GET_VertexAttribI4usvEXT(disp)) parameters
-static inline _glptr_VertexAttribI4usvEXT
-GET_VertexAttribI4usvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4usvEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttribI4usvEXT));
-}
-
-static inline void
-SET_VertexAttribI4usvEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4usvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribIPointerEXT) (GLuint, GLint,
-                                                           GLenum, GLsizei,
-                                                           const GLvoid *);
-#define CALL_VertexAttribIPointerEXT(disp, parameters) \
-    (* GET_VertexAttribIPointerEXT(disp)) parameters
-static inline _glptr_VertexAttribIPointerEXT
-GET_VertexAttribIPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribIPointerEXT) (GET_by_offset
-                                             (disp,
-                                              _gloffset_VertexAttribIPointerEXT));
-}
-
-static inline void
-SET_VertexAttribIPointerEXT(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLuint, GLint, GLenum,
-                                                   GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribIPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferTextureLayerEXT) (GLenum, GLenum,
-                                                              GLuint, GLint,
-                                                              GLint);
-#define CALL_FramebufferTextureLayerEXT(disp, parameters) \
-    (* GET_FramebufferTextureLayerEXT(disp)) parameters
-static inline _glptr_FramebufferTextureLayerEXT
-GET_FramebufferTextureLayerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTextureLayerEXT) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_FramebufferTextureLayerEXT));
-}
-
-static inline void
-SET_FramebufferTextureLayerEXT(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint,
-                                                      GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_FramebufferTextureLayerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorMaskIndexedEXT) (GLuint, GLboolean,
-                                                       GLboolean, GLboolean,
-                                                       GLboolean);
-#define CALL_ColorMaskIndexedEXT(disp, parameters) \
-    (* GET_ColorMaskIndexedEXT(disp)) parameters
-static inline _glptr_ColorMaskIndexedEXT
-GET_ColorMaskIndexedEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ColorMaskIndexedEXT) (GET_by_offset
-                                         (disp, _gloffset_ColorMaskIndexedEXT));
-}
-
-static inline void
-SET_ColorMaskIndexedEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLboolean, GLboolean,
-                                               GLboolean, GLboolean))
-{
-    SET_by_offset(disp, _gloffset_ColorMaskIndexedEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DisableIndexedEXT) (GLenum, GLuint);
-
-#define CALL_DisableIndexedEXT(disp, parameters) \
-    (* GET_DisableIndexedEXT(disp)) parameters
-static inline _glptr_DisableIndexedEXT
-GET_DisableIndexedEXT(struct _glapi_table *disp)
-{
-    return (_glptr_DisableIndexedEXT) (GET_by_offset
-                                       (disp, _gloffset_DisableIndexedEXT));
-}
-
-static inline void
-SET_DisableIndexedEXT(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_DisableIndexedEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EnableIndexedEXT) (GLenum, GLuint);
-
-#define CALL_EnableIndexedEXT(disp, parameters) \
-    (* GET_EnableIndexedEXT(disp)) parameters
-static inline _glptr_EnableIndexedEXT
-GET_EnableIndexedEXT(struct _glapi_table *disp)
-{
-    return (_glptr_EnableIndexedEXT) (GET_by_offset
-                                      (disp, _gloffset_EnableIndexedEXT));
-}
-
-static inline void
-SET_EnableIndexedEXT(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_EnableIndexedEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetBooleanIndexedvEXT) (GLenum, GLuint,
-                                                         GLboolean *);
-#define CALL_GetBooleanIndexedvEXT(disp, parameters) \
-    (* GET_GetBooleanIndexedvEXT(disp)) parameters
-static inline _glptr_GetBooleanIndexedvEXT
-GET_GetBooleanIndexedvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetBooleanIndexedvEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetBooleanIndexedvEXT));
-}
-
-static inline void
-SET_GetBooleanIndexedvEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLuint, GLboolean *))
-{
-    SET_by_offset(disp, _gloffset_GetBooleanIndexedvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetIntegerIndexedvEXT) (GLenum, GLuint,
-                                                         GLint *);
-#define CALL_GetIntegerIndexedvEXT(disp, parameters) \
-    (* GET_GetIntegerIndexedvEXT(disp)) parameters
-static inline _glptr_GetIntegerIndexedvEXT
-GET_GetIntegerIndexedvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetIntegerIndexedvEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetIntegerIndexedvEXT));
-}
-
-static inline void
-SET_GetIntegerIndexedvEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLuint, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetIntegerIndexedvEXT, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsEnabledIndexedEXT) (GLenum, GLuint);
-
-#define CALL_IsEnabledIndexedEXT(disp, parameters) \
-    (* GET_IsEnabledIndexedEXT(disp)) parameters
-static inline _glptr_IsEnabledIndexedEXT
-GET_IsEnabledIndexedEXT(struct _glapi_table *disp)
-{
-    return (_glptr_IsEnabledIndexedEXT) (GET_by_offset
-                                         (disp, _gloffset_IsEnabledIndexedEXT));
-}
-
-static inline void
-SET_IsEnabledIndexedEXT(struct _glapi_table *disp,
-                        GLboolean(GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsEnabledIndexedEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClearColorIiEXT) (GLint, GLint, GLint, GLint);
-
-#define CALL_ClearColorIiEXT(disp, parameters) \
-    (* GET_ClearColorIiEXT(disp)) parameters
-static inline _glptr_ClearColorIiEXT
-GET_ClearColorIiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ClearColorIiEXT) (GET_by_offset
-                                     (disp, _gloffset_ClearColorIiEXT));
-}
-
-static inline void
-SET_ClearColorIiEXT(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_ClearColorIiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClearColorIuiEXT) (GLuint, GLuint, GLuint,
-                                                    GLuint);
-#define CALL_ClearColorIuiEXT(disp, parameters) \
-    (* GET_ClearColorIuiEXT(disp)) parameters
-static inline _glptr_ClearColorIuiEXT
-GET_ClearColorIuiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ClearColorIuiEXT) (GET_by_offset
-                                      (disp, _gloffset_ClearColorIuiEXT));
-}
-
-static inline void
-SET_ClearColorIuiEXT(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_ClearColorIuiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexParameterIivEXT) (GLenum, GLenum,
-                                                         GLint *);
-#define CALL_GetTexParameterIivEXT(disp, parameters) \
-    (* GET_GetTexParameterIivEXT(disp)) parameters
-static inline _glptr_GetTexParameterIivEXT
-GET_GetTexParameterIivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexParameterIivEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetTexParameterIivEXT));
-}
-
-static inline void
-SET_GetTexParameterIivEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexParameterIivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexParameterIuivEXT) (GLenum, GLenum,
-                                                          GLuint *);
-#define CALL_GetTexParameterIuivEXT(disp, parameters) \
-    (* GET_GetTexParameterIuivEXT(disp)) parameters
-static inline _glptr_GetTexParameterIuivEXT
-GET_GetTexParameterIuivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexParameterIuivEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetTexParameterIuivEXT));
-}
-
-static inline void
-SET_GetTexParameterIuivEXT(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexParameterIuivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexParameterIivEXT) (GLenum, GLenum,
-                                                      const GLint *);
-#define CALL_TexParameterIivEXT(disp, parameters) \
-    (* GET_TexParameterIivEXT(disp)) parameters
-static inline _glptr_TexParameterIivEXT
-GET_TexParameterIivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TexParameterIivEXT) (GET_by_offset
-                                        (disp, _gloffset_TexParameterIivEXT));
-}
-
-static inline void
-SET_TexParameterIivEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexParameterIivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexParameterIuivEXT) (GLenum, GLenum,
-                                                       const GLuint *);
-#define CALL_TexParameterIuivEXT(disp, parameters) \
-    (* GET_TexParameterIuivEXT(disp)) parameters
-static inline _glptr_TexParameterIuivEXT
-GET_TexParameterIuivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TexParameterIuivEXT) (GET_by_offset
-                                         (disp, _gloffset_TexParameterIuivEXT));
-}
-
-static inline void
-SET_TexParameterIuivEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_TexParameterIuivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BeginConditionalRenderNV) (GLuint, GLenum);
-
-#define CALL_BeginConditionalRenderNV(disp, parameters) \
-    (* GET_BeginConditionalRenderNV(disp)) parameters
-static inline _glptr_BeginConditionalRenderNV
-GET_BeginConditionalRenderNV(struct _glapi_table *disp)
-{
-    return (_glptr_BeginConditionalRenderNV) (GET_by_offset
-                                              (disp,
-                                               _gloffset_BeginConditionalRenderNV));
-}
-
-static inline void
-SET_BeginConditionalRenderNV(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BeginConditionalRenderNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EndConditionalRenderNV) (void);
-
-#define CALL_EndConditionalRenderNV(disp, parameters) \
-    (* GET_EndConditionalRenderNV(disp)) parameters
-static inline _glptr_EndConditionalRenderNV
-GET_EndConditionalRenderNV(struct _glapi_table *disp)
-{
-    return (_glptr_EndConditionalRenderNV) (GET_by_offset
-                                            (disp,
-                                             _gloffset_EndConditionalRenderNV));
-}
-
-static inline void
-SET_EndConditionalRenderNV(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_EndConditionalRenderNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BeginTransformFeedbackEXT) (GLenum);
-
-#define CALL_BeginTransformFeedbackEXT(disp, parameters) \
-    (* GET_BeginTransformFeedbackEXT(disp)) parameters
-static inline _glptr_BeginTransformFeedbackEXT
-GET_BeginTransformFeedbackEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BeginTransformFeedbackEXT) (GET_by_offset
-                                               (disp,
-                                                _gloffset_BeginTransformFeedbackEXT));
-}
-
-static inline void
-SET_BeginTransformFeedbackEXT(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_BeginTransformFeedbackEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindBufferBaseEXT) (GLenum, GLuint, GLuint);
-
-#define CALL_BindBufferBaseEXT(disp, parameters) \
-    (* GET_BindBufferBaseEXT(disp)) parameters
-static inline _glptr_BindBufferBaseEXT
-GET_BindBufferBaseEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BindBufferBaseEXT) (GET_by_offset
-                                       (disp, _gloffset_BindBufferBaseEXT));
-}
-
-static inline void
-SET_BindBufferBaseEXT(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindBufferBaseEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindBufferOffsetEXT) (GLenum, GLuint, GLuint,
-                                                       GLintptr);
-#define CALL_BindBufferOffsetEXT(disp, parameters) \
-    (* GET_BindBufferOffsetEXT(disp)) parameters
-static inline _glptr_BindBufferOffsetEXT
-GET_BindBufferOffsetEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BindBufferOffsetEXT) (GET_by_offset
-                                         (disp, _gloffset_BindBufferOffsetEXT));
-}
-
-static inline void
-SET_BindBufferOffsetEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint,
-                                               GLintptr))
-{
-    SET_by_offset(disp, _gloffset_BindBufferOffsetEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindBufferRangeEXT) (GLenum, GLuint, GLuint,
-                                                      GLintptr, GLsizeiptr);
-#define CALL_BindBufferRangeEXT(disp, parameters) \
-    (* GET_BindBufferRangeEXT(disp)) parameters
-static inline _glptr_BindBufferRangeEXT
-GET_BindBufferRangeEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BindBufferRangeEXT) (GET_by_offset
-                                        (disp, _gloffset_BindBufferRangeEXT));
-}
-
-static inline void
-SET_BindBufferRangeEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLintptr,
-                                              GLsizeiptr))
-{
-    SET_by_offset(disp, _gloffset_BindBufferRangeEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EndTransformFeedbackEXT) (void);
-
-#define CALL_EndTransformFeedbackEXT(disp, parameters) \
-    (* GET_EndTransformFeedbackEXT(disp)) parameters
-static inline _glptr_EndTransformFeedbackEXT
-GET_EndTransformFeedbackEXT(struct _glapi_table *disp)
-{
-    return (_glptr_EndTransformFeedbackEXT) (GET_by_offset
-                                             (disp,
-                                              _gloffset_EndTransformFeedbackEXT));
-}
-
-static inline void
-SET_EndTransformFeedbackEXT(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_EndTransformFeedbackEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTransformFeedbackVaryingEXT) (GLuint,
-                                                                  GLuint,
-                                                                  GLsizei,
-                                                                  GLsizei *,
-                                                                  GLsizei *,
-                                                                  GLenum *,
-                                                                  GLchar *);
-#define CALL_GetTransformFeedbackVaryingEXT(disp, parameters) \
-    (* GET_GetTransformFeedbackVaryingEXT(disp)) parameters
-static inline _glptr_GetTransformFeedbackVaryingEXT
-GET_GetTransformFeedbackVaryingEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetTransformFeedbackVaryingEXT) (GET_by_offset
-                                                    (disp,
-                                                     _gloffset_GetTransformFeedbackVaryingEXT));
-}
-
-static inline void
-SET_GetTransformFeedbackVaryingEXT(struct _glapi_table *disp,
-                                   void (GLAPIENTRYP fn) (GLuint, GLuint,
-                                                          GLsizei, GLsizei *,
-                                                          GLsizei *, GLenum *,
-                                                          GLchar *))
-{
-    SET_by_offset(disp, _gloffset_GetTransformFeedbackVaryingEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TransformFeedbackVaryingsEXT) (GLuint, GLsizei,
-                                                                const char **,
-                                                                GLenum);
-#define CALL_TransformFeedbackVaryingsEXT(disp, parameters) \
-    (* GET_TransformFeedbackVaryingsEXT(disp)) parameters
-static inline _glptr_TransformFeedbackVaryingsEXT
-GET_TransformFeedbackVaryingsEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TransformFeedbackVaryingsEXT) (GET_by_offset
-                                                  (disp,
-                                                   _gloffset_TransformFeedbackVaryingsEXT));
-}
-
-static inline void
-SET_TransformFeedbackVaryingsEXT(struct _glapi_table *disp,
-                                 void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                        const char **, GLenum))
-{
-    SET_by_offset(disp, _gloffset_TransformFeedbackVaryingsEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProvokingVertexEXT) (GLenum);
-
-#define CALL_ProvokingVertexEXT(disp, parameters) \
-    (* GET_ProvokingVertexEXT(disp)) parameters
-static inline _glptr_ProvokingVertexEXT
-GET_ProvokingVertexEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ProvokingVertexEXT) (GET_by_offset
-                                        (disp, _gloffset_ProvokingVertexEXT));
-}
-
-static inline void
-SET_ProvokingVertexEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ProvokingVertexEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexParameterPointervAPPLE) (GLenum, GLenum,
-                                                                GLvoid **);
-#define CALL_GetTexParameterPointervAPPLE(disp, parameters) \
-    (* GET_GetTexParameterPointervAPPLE(disp)) parameters
-static inline _glptr_GetTexParameterPointervAPPLE
-GET_GetTexParameterPointervAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexParameterPointervAPPLE) (GET_by_offset
-                                                  (disp,
-                                                   _gloffset_GetTexParameterPointervAPPLE));
-}
-
-static inline void
-SET_GetTexParameterPointervAPPLE(struct _glapi_table *disp,
-                                 void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                        GLvoid **))
-{
-    SET_by_offset(disp, _gloffset_GetTexParameterPointervAPPLE, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TextureRangeAPPLE) (GLenum, GLsizei, GLvoid *);
-
-#define CALL_TextureRangeAPPLE(disp, parameters) \
-    (* GET_TextureRangeAPPLE(disp)) parameters
-static inline _glptr_TextureRangeAPPLE
-GET_TextureRangeAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_TextureRangeAPPLE) (GET_by_offset
-                                       (disp, _gloffset_TextureRangeAPPLE));
-}
-
-static inline void
-SET_TextureRangeAPPLE(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLsizei, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TextureRangeAPPLE, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetObjectParameterivAPPLE) (GLenum, GLuint,
-                                                             GLenum, GLint *);
-#define CALL_GetObjectParameterivAPPLE(disp, parameters) \
-    (* GET_GetObjectParameterivAPPLE(disp)) parameters
-static inline _glptr_GetObjectParameterivAPPLE
-GET_GetObjectParameterivAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_GetObjectParameterivAPPLE) (GET_by_offset
-                                               (disp,
-                                                _gloffset_GetObjectParameterivAPPLE));
-}
-
-static inline void
-SET_GetObjectParameterivAPPLE(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLuint, GLenum,
-                                                     GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetObjectParameterivAPPLE, fn);
-}
-
-typedef GLenum(GLAPIENTRYP _glptr_ObjectPurgeableAPPLE) (GLenum, GLuint,
-                                                         GLenum);
-#define CALL_ObjectPurgeableAPPLE(disp, parameters) \
-    (* GET_ObjectPurgeableAPPLE(disp)) parameters
-static inline _glptr_ObjectPurgeableAPPLE
-GET_ObjectPurgeableAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_ObjectPurgeableAPPLE) (GET_by_offset
-                                          (disp,
-                                           _gloffset_ObjectPurgeableAPPLE));
-}
-
-static inline void
-SET_ObjectPurgeableAPPLE(struct _glapi_table *disp,
-                         GLenum(GLAPIENTRYP fn) (GLenum, GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_ObjectPurgeableAPPLE, fn);
-}
-
-typedef GLenum(GLAPIENTRYP _glptr_ObjectUnpurgeableAPPLE) (GLenum, GLuint,
-                                                           GLenum);
-#define CALL_ObjectUnpurgeableAPPLE(disp, parameters) \
-    (* GET_ObjectUnpurgeableAPPLE(disp)) parameters
-static inline _glptr_ObjectUnpurgeableAPPLE
-GET_ObjectUnpurgeableAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_ObjectUnpurgeableAPPLE) (GET_by_offset
-                                            (disp,
-                                             _gloffset_ObjectUnpurgeableAPPLE));
-}
-
-static inline void
-SET_ObjectUnpurgeableAPPLE(struct _glapi_table *disp,
-                           GLenum(GLAPIENTRYP fn) (GLenum, GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_ObjectUnpurgeableAPPLE, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ActiveProgramEXT) (GLuint);
-
-#define CALL_ActiveProgramEXT(disp, parameters) \
-    (* GET_ActiveProgramEXT(disp)) parameters
-static inline _glptr_ActiveProgramEXT
-GET_ActiveProgramEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ActiveProgramEXT) (GET_by_offset
-                                      (disp, _gloffset_ActiveProgramEXT));
-}
-
-static inline void
-SET_ActiveProgramEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_ActiveProgramEXT, fn);
-}
-
-typedef GLuint(GLAPIENTRYP _glptr_CreateShaderProgramEXT) (GLenum,
-                                                           const GLchar *);
-#define CALL_CreateShaderProgramEXT(disp, parameters) \
-    (* GET_CreateShaderProgramEXT(disp)) parameters
-static inline _glptr_CreateShaderProgramEXT
-GET_CreateShaderProgramEXT(struct _glapi_table *disp)
-{
-    return (_glptr_CreateShaderProgramEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_CreateShaderProgramEXT));
-}
-
-static inline void
-SET_CreateShaderProgramEXT(struct _glapi_table *disp,
-                           GLuint(GLAPIENTRYP fn) (GLenum, const GLchar *))
-{
-    SET_by_offset(disp, _gloffset_CreateShaderProgramEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UseShaderProgramEXT) (GLenum, GLuint);
-
-#define CALL_UseShaderProgramEXT(disp, parameters) \
-    (* GET_UseShaderProgramEXT(disp)) parameters
-static inline _glptr_UseShaderProgramEXT
-GET_UseShaderProgramEXT(struct _glapi_table *disp)
-{
-    return (_glptr_UseShaderProgramEXT) (GET_by_offset
-                                         (disp, _gloffset_UseShaderProgramEXT));
-}
-
-static inline void
-SET_UseShaderProgramEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_UseShaderProgramEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TextureBarrierNV) (void);
-
-#define CALL_TextureBarrierNV(disp, parameters) \
-    (* GET_TextureBarrierNV(disp)) parameters
-static inline _glptr_TextureBarrierNV
-GET_TextureBarrierNV(struct _glapi_table *disp)
-{
-    return (_glptr_TextureBarrierNV) (GET_by_offset
-                                      (disp, _gloffset_TextureBarrierNV));
-}
-
-static inline void
-SET_TextureBarrierNV(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_TextureBarrierNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_StencilFuncSeparateATI) (GLenum, GLenum, GLint,
-                                                          GLuint);
-#define CALL_StencilFuncSeparateATI(disp, parameters) \
-    (* GET_StencilFuncSeparateATI(disp)) parameters
-static inline _glptr_StencilFuncSeparateATI
-GET_StencilFuncSeparateATI(struct _glapi_table *disp)
-{
-    return (_glptr_StencilFuncSeparateATI) (GET_by_offset
-                                            (disp,
-                                             _gloffset_StencilFuncSeparateATI));
-}
-
-static inline void
-SET_StencilFuncSeparateATI(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLenum, GLint,
-                                                  GLuint))
-{
-    SET_by_offset(disp, _gloffset_StencilFuncSeparateATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramEnvParameters4fvEXT) (GLenum, GLuint,
-                                                              GLsizei,
-                                                              const GLfloat *);
-#define CALL_ProgramEnvParameters4fvEXT(disp, parameters) \
-    (* GET_ProgramEnvParameters4fvEXT(disp)) parameters
-static inline _glptr_ProgramEnvParameters4fvEXT
-GET_ProgramEnvParameters4fvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramEnvParameters4fvEXT) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_ProgramEnvParameters4fvEXT));
-}
-
-static inline void
-SET_ProgramEnvParameters4fvEXT(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLuint, GLsizei,
-                                                      const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ProgramEnvParameters4fvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramLocalParameters4fvEXT) (GLenum, GLuint,
-                                                                GLsizei,
-                                                                const GLfloat
-                                                                *);
-#define CALL_ProgramLocalParameters4fvEXT(disp, parameters) \
-    (* GET_ProgramLocalParameters4fvEXT(disp)) parameters
-static inline _glptr_ProgramLocalParameters4fvEXT
-GET_ProgramLocalParameters4fvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramLocalParameters4fvEXT) (GET_by_offset
-                                                  (disp,
-                                                   _gloffset_ProgramLocalParameters4fvEXT));
-}
-
-static inline void
-SET_ProgramLocalParameters4fvEXT(struct _glapi_table *disp,
-                                 void (GLAPIENTRYP fn) (GLenum, GLuint, GLsizei,
-                                                        const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ProgramLocalParameters4fvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetQueryObjecti64vEXT) (GLuint, GLenum,
-                                                         GLint64EXT *);
-#define CALL_GetQueryObjecti64vEXT(disp, parameters) \
-    (* GET_GetQueryObjecti64vEXT(disp)) parameters
-static inline _glptr_GetQueryObjecti64vEXT
-GET_GetQueryObjecti64vEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetQueryObjecti64vEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetQueryObjecti64vEXT));
-}
-
-static inline void
-SET_GetQueryObjecti64vEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint, GLenum, GLint64EXT *))
-{
-    SET_by_offset(disp, _gloffset_GetQueryObjecti64vEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetQueryObjectui64vEXT) (GLuint, GLenum,
-                                                          GLuint64EXT *);
-#define CALL_GetQueryObjectui64vEXT(disp, parameters) \
-    (* GET_GetQueryObjectui64vEXT(disp)) parameters
-static inline _glptr_GetQueryObjectui64vEXT
-GET_GetQueryObjectui64vEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetQueryObjectui64vEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetQueryObjectui64vEXT));
-}
-
-static inline void
-SET_GetQueryObjectui64vEXT(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLuint, GLenum,
-                                                  GLuint64EXT *))
-{
-    SET_by_offset(disp, _gloffset_GetQueryObjectui64vEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EGLImageTargetRenderbufferStorageOES) (GLenum,
-                                                                        GLvoid
-                                                                        *);
-#define CALL_EGLImageTargetRenderbufferStorageOES(disp, parameters) \
-    (* GET_EGLImageTargetRenderbufferStorageOES(disp)) parameters
-static inline _glptr_EGLImageTargetRenderbufferStorageOES
-GET_EGLImageTargetRenderbufferStorageOES(struct _glapi_table *disp)
-{
-    return (_glptr_EGLImageTargetRenderbufferStorageOES) (GET_by_offset
-                                                          (disp,
-                                                           _gloffset_EGLImageTargetRenderbufferStorageOES));
-}
-
-static inline void
-SET_EGLImageTargetRenderbufferStorageOES(struct _glapi_table *disp,
-                                         void (GLAPIENTRYP fn) (GLenum,
-                                                                GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_EGLImageTargetRenderbufferStorageOES, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EGLImageTargetTexture2DOES) (GLenum, GLvoid *);
-
-#define CALL_EGLImageTargetTexture2DOES(disp, parameters) \
-    (* GET_EGLImageTargetTexture2DOES(disp)) parameters
-static inline _glptr_EGLImageTargetTexture2DOES
-GET_EGLImageTargetTexture2DOES(struct _glapi_table *disp)
-{
-    return (_glptr_EGLImageTargetTexture2DOES) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_EGLImageTargetTexture2DOES));
-}
-
-static inline void
-SET_EGLImageTargetTexture2DOES(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_EGLImageTargetTexture2DOES, fn);
-}
-
-#endif                          /* !defined( _DISPATCH_H_ ) */
diff --git a/xorg-server/glx/extension_string.c b/xorg-server/glx/extension_string.c
index 58f930f75..4bef96f0b 100644
--- a/xorg-server/glx/extension_string.c
+++ b/xorg-server/glx/extension_string.c
@@ -65,12 +65,17 @@ struct extension_info {
     unsigned char driver_support;
 };
 
+/**
+ * List of known GLX Extensions.
+ * The last Y/N switch informs whether the support of this extension is always enabled.
+ */
 static const struct extension_info known_glx_extensions[] = {
 /*   GLX_ARB_get_proc_address is implemented on the client. */
     /* *INDENT-OFF* */
     { GLX(ARB_create_context),          VER(0,0), N, },
     { GLX(ARB_create_context_profile),  VER(0,0), N, },
     { GLX(ARB_create_context_robustness), VER(0,0), N, },
+    { GLX(ARB_fbconfig_float),          VER(0,0), N, },
     { GLX(ARB_framebuffer_sRGB),        VER(0,0), N, },
     { GLX(ARB_multisample),             VER(1,4), Y, },
 
diff --git a/xorg-server/glx/extension_string.h b/xorg-server/glx/extension_string.h
index 81b7de372..e7d393297 100644
--- a/xorg-server/glx/extension_string.h
+++ b/xorg-server/glx/extension_string.h
@@ -39,6 +39,7 @@ enum {
     ARB_create_context_bit = 0,
     ARB_create_context_profile_bit,
     ARB_create_context_robustness_bit,
+    ARB_fbconfig_float_bit,
     ARB_framebuffer_sRGB_bit,
     ARB_multisample_bit,
     EXT_create_context_es2_profile_bit,
diff --git a/xorg-server/glx/glapi.c b/xorg-server/glx/glapi.c
deleted file mode 100644
index ad7329eff..000000000
--- a/xorg-server/glx/glapi.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * This file manages the OpenGL API dispatch layer.  There are functions
- * to set/get the current dispatch table for the current thread and to
- * manage registration/dispatch of dynamically added extension functions.
- *
- * This code was originally general enough to be shared with Mesa, but
- * they diverged long ago, so this is now just enough support to make
- * indirect GLX work.
- */
-
-#include <dix-config.h>
-#include <X11/Xfuncproto.h>
-#include <os.h>
-#define PUBLIC _X_EXPORT
-
-#include <stdlib.h>
-#include <string.h>
-#ifdef DEBUG
-#include <assert.h>
-#endif
-
-#include "glapi.h"
-#include "dispatch.h"
-#include "glapitable.h"
-
-#define FIRST_DYNAMIC_OFFSET (sizeof(struct _glapi_table) / sizeof(void *))
-
-#if defined(PTHREADS) || defined(GLX_USE_TLS)
-static void init_glapi_relocs(void);
-#endif
-
-/**
- * \name Current dispatch and current context control variables
- *
- * Depending on whether or not multithreading is support, and the type of
- * support available, several variables are used to store the current context
- * pointer and the current dispatch table pointer.  In the non-threaded case,
- * the variables \c _glapi_Dispatch and \c _glapi_Context are used for this
- * purpose.
- *
- * In the "normal" threaded case, the variables \c _glapi_Dispatch and
- * \c _glapi_Context will be \c NULL if an application is detected as being
- * multithreaded.  Single-threaded applications will use \c _glapi_Dispatch
- * and \c _glapi_Context just like the case without any threading support.
- * When \c _glapi_Dispatch and \c _glapi_Context are \c NULL, the thread state
- * data \c _gl_DispatchTSD and \c ContextTSD are used.  Drivers and the
- * static dispatch functions access these variables via \c _glapi_get_dispatch
- * and \c _glapi_get_context.
- *
- * In the TLS case, the variables \c _glapi_Dispatch and \c _glapi_Context are
- * hardcoded to \c NULL.  Instead the TLS variables \c _glapi_tls_Dispatch and
- * \c _glapi_tls_Context are used.  Having \c _glapi_Dispatch and
- * \c _glapi_Context be hardcoded to \c NULL maintains binary compatability
- * between TLS enabled loaders and non-TLS DRI drivers.
- */
-/*@{*/
-#if defined(GLX_USE_TLS)
-
-PUBLIC TLS struct _glapi_table *_glapi_tls_Dispatch = NULL;
-
-PUBLIC TLS void *_glapi_tls_Context;
-
-PUBLIC const struct _glapi_table *_glapi_Dispatch = NULL;
-PUBLIC const void *_glapi_Context = NULL;
-
-#else
-
-#if defined(THREADS)
-
-_glthread_TSD _gl_DispatchTSD;           /**< Per-thread dispatch pointer */
-static _glthread_TSD ContextTSD;         /**< Per-thread context pointer */
-
-#if defined(WIN32_THREADS)
-void FreeTSD(_glthread_TSD * p);
-void
-FreeAllTSD(void)
-{
-    FreeTSD(&_gl_DispatchTSD);
-    FreeTSD(&ContextTSD);
-}
-#endif                          /* defined(WIN32_THREADS) */
-
-#endif                          /* defined(THREADS) */
-
-PUBLIC struct _glapi_table *_glapi_Dispatch = NULL;
-PUBLIC void *_glapi_Context = NULL;
-
-#endif                          /* defined(GLX_USE_TLS) */
-/*@}*/
-
-/*
- * xserver's gl is not multithreaded, we promise.
- */
-PUBLIC void
-_glapi_check_multithread(void)
-{
-}
-
-/**
- * Set the current context pointer for this thread.
- * The context pointer is an opaque type which should be cast to
- * void from the real context pointer type.
- */
-PUBLIC void
-_glapi_set_context(void *context)
-{
-#if defined(GLX_USE_TLS)
-    _glapi_tls_Context = context;
-#elif defined(THREADS)
-    _glthread_SetTSD(&ContextTSD, context);
-    _glapi_Context = context;
-#else
-    _glapi_Context = context;
-#endif
-}
-
-/**
- * Get the current context pointer for this thread.
- * The context pointer is an opaque type which should be cast from
- * void to the real context pointer type.
- */
-PUBLIC void *
-_glapi_get_context(void)
-{
-#if defined(GLX_USE_TLS)
-    return _glapi_tls_Context;
-#else
-    return _glapi_Context;
-#endif
-}
-
-/**
- * Set the global or per-thread dispatch table pointer.
- */
-PUBLIC void
-_glapi_set_dispatch(struct _glapi_table *dispatch)
-{
-#if defined(PTHREADS) || defined(GLX_USE_TLS)
-    static pthread_once_t once_control = PTHREAD_ONCE_INIT;
-
-    pthread_once(&once_control, init_glapi_relocs);
-#endif
-
-#if defined(GLX_USE_TLS)
-    _glapi_tls_Dispatch = dispatch;
-#elif defined(THREADS)
-    _glthread_SetTSD(&_gl_DispatchTSD, (void *) dispatch);
-    _glapi_Dispatch = dispatch;
-#else /*THREADS*/
-        _glapi_Dispatch = dispatch;
-#endif /*THREADS*/
-}
-
-/**
- * Return pointer to current dispatch table for calling thread.
- */
-PUBLIC struct _glapi_table *
-_glapi_get_dispatch(void)
-{
-    struct _glapi_table *api;
-
-#if defined(GLX_USE_TLS)
-    api = _glapi_tls_Dispatch;
-#else
-    api = _glapi_Dispatch;
-#endif
-    return api;
-}
-
-/***
- *** The rest of this file is pretty much concerned with GetProcAddress
- *** functionality.
- ***/
-
-#if defined(USE_X64_64_ASM) && defined(GLX_USE_TLS)
-#define DISPATCH_FUNCTION_SIZE  16
-#elif defined(USE_X86_ASM)
-#if defined(THREADS) && !defined(GLX_USE_TLS)
-#define DISPATCH_FUNCTION_SIZE  32
-#else
-#define DISPATCH_FUNCTION_SIZE  16
-#endif
-#endif
-
-/* The code in this file is auto-generated with Python */
-#include "glprocs.h"
-
-/**
- * Search the table of static entrypoint functions for the named function
- * and return the corresponding glprocs_table_t entry.
- */
-static const glprocs_table_t *
-find_entry(const char *n)
-{
-    GLuint i;
-
-    for (i = 0; static_functions[i].Name_offset >= 0; i++) {
-        const char *testName =
-            gl_string_table + static_functions[i].Name_offset;
-        if (strcmp(testName, n) == 0) {
-            return &static_functions[i];
-        }
-    }
-    return NULL;
-}
-
-/**
- * Return dispatch table offset of the named static (built-in) function.
- * Return -1 if function not found.
- */
-static GLint
-get_static_proc_offset(const char *funcName)
-{
-    const glprocs_table_t *const f = find_entry(funcName);
-
-    if (f) {
-        return f->Offset;
-    }
-    return -1;
-}
-
-/**********************************************************************
- * Extension function management.
- */
-
-/*
- * Number of extension functions which we can dynamically add at runtime.
- */
-#define MAX_EXTENSION_FUNCS 300
-
-/*
- * The dispatch table size (number of entries) is the size of the
- * _glapi_table struct plus the number of dynamic entries we can add.
- * The extra slots can be filled in by DRI drivers that register new extension
- * functions.
- */
-#define DISPATCH_TABLE_SIZE (sizeof(struct _glapi_table) / sizeof(void *) + MAX_EXTENSION_FUNCS)
-
-/**
- * Track information about a function added to the GL API.
- */
-struct _glapi_function {
-   /**
-    * Name of the function.
-    */
-    const char *name;
-
-   /**
-    * Text string that describes the types of the parameters passed to the
-    * named function.   Parameter types are converted to characters using the
-    * following rules:
-    *   - 'i' for \c GLint, \c GLuint, and \c GLenum
-    *   - 'p' for any pointer type
-    *   - 'f' for \c GLfloat and \c GLclampf
-    *   - 'd' for \c GLdouble and \c GLclampd
-    */
-    const char *parameter_signature;
-
-   /**
-    * Offset in the dispatch table where the pointer to the real function is
-    * located.  If the driver has not requested that the named function be
-    * added to the dispatch table, this will have the value ~0.
-    */
-    unsigned dispatch_offset;
-};
-
-static struct _glapi_function ExtEntryTable[MAX_EXTENSION_FUNCS];
-static GLuint NumExtEntryPoints = 0;
-
-/**
- * Generate new entrypoint
- *
- * Use a temporary dispatch offset of ~0 (i.e. -1).  Later, when the driver
- * calls \c _glapi_add_dispatch we'll put in the proper offset.  If that
- * never happens, and the user calls this function, he'll segfault.  That's
- * what you get when you try calling a GL function that doesn't really exist.
- * 
- * \param funcName  Name of the function to create an entry-point for.
- * 
- * \sa _glapi_add_entrypoint
- */
-
-static struct _glapi_function *
-add_function_name(const char *funcName)
-{
-    struct _glapi_function *entry = NULL;
-
-    if (NumExtEntryPoints < MAX_EXTENSION_FUNCS) {
-        entry = &ExtEntryTable[NumExtEntryPoints];
-
-        ExtEntryTable[NumExtEntryPoints].name = strdup(funcName);
-        ExtEntryTable[NumExtEntryPoints].parameter_signature = NULL;
-        ExtEntryTable[NumExtEntryPoints].dispatch_offset = ~0;
-        NumExtEntryPoints++;
-    }
-
-    return entry;
-}
-
-/**
- * Fill-in the dispatch stub for the named function.
- * 
- * This function is intended to be called by a hardware driver.  When called,
- * a dispatch stub may be created created for the function.  A pointer to this
- * dispatch function will be returned by glXGetProcAddress.
- *
- * \param function_names       Array of pointers to function names that should
- *                             share a common dispatch offset.
- * \param parameter_signature  String representing the types of the parameters
- *                             passed to the named function.  Parameter types
- *                             are converted to characters using the following
- *                             rules:
- *                               - 'i' for \c GLint, \c GLuint, and \c GLenum
- *                               - 'p' for any pointer type
- *                               - 'f' for \c GLfloat and \c GLclampf
- *                               - 'd' for \c GLdouble and \c GLclampd
- *
- * \returns
- * The offset in the dispatch table of the named function.  A pointer to the
- * driver's implementation of the named function should be stored at
- * \c dispatch_table[\c offset].
- *
- * \sa glXGetProcAddress
- *
- * \warning
- * This function can only handle up to 8 names at a time.  As far as I know,
- * the maximum number of names ever associated with an existing GL function is
- * 4 (\c glPointParameterfSGIS, \c glPointParameterfEXT,
- * \c glPointParameterfARB, and \c glPointParameterf), so this should not be
- * too painful of a limitation.
- *
- * \todo
- * Determine whether or not \c parameter_signature should be allowed to be
- * \c NULL.  It doesn't seem like much of a hardship for drivers to have to
- * pass in an empty string.
- *
- * \todo
- * Determine if code should be added to reject function names that start with
- * 'glX'.
- * 
- * \bug
- * Add code to compare \c parameter_signature with the parameter signature of
- * a static function.  In order to do that, we need to find a way to \b get
- * the parameter signature of a static function.
- */
-
-PUBLIC int
-_glapi_add_dispatch(const char *const *function_names,
-                    const char *parameter_signature)
-{
-    static int next_dynamic_offset = FIRST_DYNAMIC_OFFSET;
-    const char *const real_sig = (parameter_signature != NULL)
-        ? parameter_signature : "";
-    struct _glapi_function *entry[8];
-    GLboolean is_static[8];
-    unsigned i;
-    unsigned j;
-    int offset = ~0;
-    int new_offset;
-
-    (void) memset(is_static, 0, sizeof(is_static));
-    (void) memset(entry, 0, sizeof(entry));
-
-    for (i = 0; function_names[i] != NULL; i++) {
-        /* Do some trivial validation on the name of the function. */
-
-        if (function_names[i][0] != 'g' || function_names[i][1] != 'l')
-            return GL_FALSE;
-
-        /* Determine if the named function already exists.  If the function does
-         * exist, it must have the same parameter signature as the function
-         * being added.
-         */
-
-        new_offset = get_static_proc_offset(function_names[i]);
-        if (new_offset >= 0) {
-            /* FIXME: Make sure the parameter signatures match!  How do we get
-             * FIXME: the parameter signature for static functions?
-             */
-
-            if ((offset != ~0) && (new_offset != offset)) {
-                return -1;
-            }
-
-            is_static[i] = GL_TRUE;
-            offset = new_offset;
-        }
-
-        for (j = 0; j < NumExtEntryPoints; j++) {
-            if (strcmp(ExtEntryTable[j].name, function_names[i]) == 0) {
-                /* The offset may be ~0 if the function name was added by
-                 * glXGetProcAddress but never filled in by the driver.
-                 */
-
-                if (ExtEntryTable[j].dispatch_offset != ~0) {
-                    if (strcmp(real_sig, ExtEntryTable[j].parameter_signature)
-                        != 0)
-                        return -1;
-
-                    if ((offset != ~0) &&
-                        (ExtEntryTable[j].dispatch_offset != offset)) {
-                        return -1;
-                    }
-
-                    offset = ExtEntryTable[j].dispatch_offset;
-                }
-
-                entry[i] = &ExtEntryTable[j];
-                break;
-            }
-        }
-    }
-
-    if (offset == ~0) {
-        offset = next_dynamic_offset;
-        next_dynamic_offset++;
-    }
-
-    for (i = 0; function_names[i] != NULL; i++) {
-        if (!is_static[i]) {
-            if (entry[i] == NULL) {
-                entry[i] = add_function_name(function_names[i]);
-                if (entry[i] == NULL)
-                    return -1;
-            }
-
-            entry[i]->parameter_signature = strdup(real_sig);
-            entry[i]->dispatch_offset = offset;
-        }
-    }
-
-    return offset;
-}
-
-/*
- * glXGetProcAddress doesn't exist in the protocol, the drivers never call
- * this themselves, and neither does the server.  warn if it happens though.
- */
-PUBLIC _glapi_proc
-_glapi_get_proc_address(const char *funcName)
-{
-    ErrorF("_glapi_get_proc_address called!\n");
-    return NULL;
-}
-
-/**
- * Return size of dispatch table struct as number of functions (or
- * slots).
- */
-PUBLIC GLuint
-_glapi_get_dispatch_table_size(void)
-{
-    return DISPATCH_TABLE_SIZE;
-}
-
-#if defined(PTHREADS) || defined(GLX_USE_TLS)
-/**
- * Perform platform-specific GL API entry-point fixups.
- */
-static void
-init_glapi_relocs(void)
-{
-#if defined(USE_X86_ASM) && defined(GLX_USE_TLS) && !defined(GLX_X86_READONLY_TEXT)
-    extern unsigned long _x86_get_dispatch(void);
-
-    char run_time_patch[] = {
-        0x65, 0xa1, 0, 0, 0, 0  /* movl %gs:0,%eax */
-    };
-    GLuint *offset = (GLuint *) &run_time_patch[2];    /* 32-bits for x86/32 */
-    const GLubyte *const get_disp = (const GLubyte *) run_time_patch;
-    GLubyte *curr_func = (GLubyte *) gl_dispatch_functions_start;
-
-    *offset = _x86_get_dispatch();
-    while (curr_func != (GLubyte *) gl_dispatch_functions_end) {
-        (void) memcpy(curr_func, get_disp, sizeof(run_time_patch));
-        curr_func += DISPATCH_FUNCTION_SIZE;
-    }
-#endif
-}
-#endif                          /* defined(PTHREADS) || defined(GLX_USE_TLS) */
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h
deleted file mode 100644
index bad791eab..000000000
--- a/xorg-server/glx/glapi.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \mainpage Mesa GL API Module
- *
- * \section GLAPIIntroduction Introduction
- *
- * The Mesa GL API module is responsible for dispatching all the
- * gl*() functions.  All GL functions are dispatched by jumping through
- * the current dispatch table (basically a struct full of function
- * pointers.)
- *
- * A per-thread current dispatch table and per-thread current context
- * pointer are managed by this module too.
- *
- * This module is intended to be non-Mesa-specific so it can be used
- * with the X/DRI libGL also.
- */
-
-#ifndef _GLAPI_H
-#define _GLAPI_H
-
-#define GL_GLEXT_PROTOTYPES
-
-#include "GL/gl.h"
-#include "GL/glext.h"
-#include "glthread.h"
-
-struct _glapi_table;
-
-typedef void (*_glapi_proc) (void);     /* generic function pointer */
-
-typedef void (*_glapi_warning_func) (void *ctx, const char *str, ...);
-
-#if defined(USE_MGL_NAMESPACE)
-#define _glapi_set_dispatch _mglapi_set_dispatch
-#define _glapi_get_dispatch _mglapi_get_dispatch
-#define _glapi_set_context _mglapi_set_context
-#define _glapi_get_context _mglapi_get_context
-#define _glapi_Context _mglapi_Context
-#define _glapi_Dispatch _mglapi_Dispatch
-#endif
-
-/*
- * Number of extension functions which we can dynamically add at runtime.
- */
-#define MAX_EXTENSION_FUNCS 300
-
-/**
- ** Define the GET_CURRENT_CONTEXT() macro.
- ** \param C local variable which will hold the current context.
- **/
-#if defined (GLX_USE_TLS)
-
-const extern void *_glapi_Context;
-const extern struct _glapi_table *_glapi_Dispatch;
-
-extern TLS void *_glapi_tls_Context;
-
-#define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_tls_Context
-
-#else
-
-extern void *_glapi_Context;
-extern struct _glapi_table *_glapi_Dispatch;
-
-#ifdef THREADS
-#define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context())
-#else
-#define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_Context
-#endif
-
-#endif                          /* defined (GLX_USE_TLS) */
-
-/**
- ** GL API public functions
- **/
-
-extern void
- _glapi_check_multithread(void);
-
-extern void
- _glapi_set_context(void *context);
-
-extern void *_glapi_get_context(void);
-
-extern void
- _glapi_set_dispatch(struct _glapi_table *dispatch);
-
-extern struct _glapi_table *_glapi_get_dispatch(void);
-
-extern int
- _glapi_begin_dispatch_override(struct _glapi_table *override);
-
-extern void
- _glapi_end_dispatch_override(int layer);
-
-struct _glapi_table *_glapi_get_override_dispatch(int layer);
-
-extern GLuint _glapi_get_dispatch_table_size(void);
-
-extern int
-
-_glapi_add_dispatch(const char *const *function_names,
-                    const char *parameter_signature);
-
-extern _glapi_proc _glapi_get_proc_address(const char *funcName);
-
-extern struct _glapi_table *_glapi_create_table_from_handle(void *handle,
-                                                            const char
-                                                            *symbol_prefix);
-
-#endif
diff --git a/xorg-server/glx/glapi_gentable.c b/xorg-server/glx/glapi_gentable.c
deleted file mode 100644
index 4b2801547..000000000
--- a/xorg-server/glx/glapi_gentable.c
+++ /dev/null
@@ -1,10058 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by gl_gen_table.py (from Mesa) script */
-
-/*
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
- * (C) Copyright IBM Corporation 2004, 2005
- * (C) Copyright Apple Inc 2011
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL, IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* GLXEXT is the define used in the xserver when the GLX extension is being
- * built.  Hijack this to determine whether this file is being built for the
- * server or the client.
- */
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \
-	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE))
-#define USE_BACKTRACE
-#endif
-
-#ifdef USE_BACKTRACE
-#include <execinfo.h>
-#endif
-
-#include <dlfcn.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <GL/gl.h>
-
-#include "glapi.h"
-#include "glapitable.h"
-
-#ifdef GLXEXT
-#include "os.h"
-#endif
-
-static void
-__glapi_gentable_NoOp(void)
-{
-    const char *fstr = "Unknown";
-
-    /* Silence potential GCC warning for some #ifdef paths.
-     */
-    (void) fstr;
-#if defined(USE_BACKTRACE)
-#if !defined(GLXEXT)
-    if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"))
-#endif
-    {
-        void *frames[2];
-
-        if (backtrace(frames, 2) == 2) {
-            Dl_info info;
-
-            dladdr(frames[1], &info);
-            if (info.dli_sname)
-                fstr = info.dli_sname;
-        }
-
-#if !defined(GLXEXT)
-        fprintf(stderr, "Call to unimplemented API: %s\n", fstr);
-#endif
-    }
-#endif
-#if defined(GLXEXT)
-    LogMessage(X_ERROR, "GLX: Call to unimplemented API: %s\n", fstr);
-#endif
-}
-
-static void
-__glapi_gentable_set_remaining_noop(struct _glapi_table *disp)
-{
-    GLuint entries = _glapi_get_dispatch_table_size();
-    void **dispatch = (void **) disp;
-    int i;
-
-    /* ISO C is annoying sometimes */
-    union {
-        _glapi_proc p;
-        void *v;
-    } p;
-
-    p.p = __glapi_gentable_NoOp;
-
-    for (i = 0; i < entries; i++)
-        if (dispatch[i] == NULL)
-            dispatch[i] = p.v;
-}
-
-struct _glapi_table *
-_glapi_create_table_from_handle(void *handle, const char *symbol_prefix)
-{
-    struct _glapi_table *disp = calloc(_glapi_get_dispatch_table_size(), sizeof(void*));
-    char symboln[512];
-
-    if (!disp)
-        return NULL;
-
-    if (symbol_prefix == NULL)
-        symbol_prefix = "";
-
-    if (!disp->NewList) {
-        void **procp = (void **) &disp->NewList;
-
-        snprintf(symboln, sizeof(symboln), "%sNewList", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EndList) {
-        void **procp = (void **) &disp->EndList;
-
-        snprintf(symboln, sizeof(symboln), "%sEndList", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CallList) {
-        void **procp = (void **) &disp->CallList;
-
-        snprintf(symboln, sizeof(symboln), "%sCallList", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CallLists) {
-        void **procp = (void **) &disp->CallLists;
-
-        snprintf(symboln, sizeof(symboln), "%sCallLists", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteLists) {
-        void **procp = (void **) &disp->DeleteLists;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteLists", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenLists) {
-        void **procp = (void **) &disp->GenLists;
-
-        snprintf(symboln, sizeof(symboln), "%sGenLists", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ListBase) {
-        void **procp = (void **) &disp->ListBase;
-
-        snprintf(symboln, sizeof(symboln), "%sListBase", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Begin) {
-        void **procp = (void **) &disp->Begin;
-
-        snprintf(symboln, sizeof(symboln), "%sBegin", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Bitmap) {
-        void **procp = (void **) &disp->Bitmap;
-
-        snprintf(symboln, sizeof(symboln), "%sBitmap", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3b) {
-        void **procp = (void **) &disp->Color3b;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3b", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3bv) {
-        void **procp = (void **) &disp->Color3bv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3bv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3d) {
-        void **procp = (void **) &disp->Color3d;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3dv) {
-        void **procp = (void **) &disp->Color3dv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3f) {
-        void **procp = (void **) &disp->Color3f;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3fv) {
-        void **procp = (void **) &disp->Color3fv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3i) {
-        void **procp = (void **) &disp->Color3i;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3iv) {
-        void **procp = (void **) &disp->Color3iv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3s) {
-        void **procp = (void **) &disp->Color3s;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3sv) {
-        void **procp = (void **) &disp->Color3sv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3ub) {
-        void **procp = (void **) &disp->Color3ub;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3ub", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3ubv) {
-        void **procp = (void **) &disp->Color3ubv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3ubv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3ui) {
-        void **procp = (void **) &disp->Color3ui;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3uiv) {
-        void **procp = (void **) &disp->Color3uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3us) {
-        void **procp = (void **) &disp->Color3us;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3us", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color3usv) {
-        void **procp = (void **) &disp->Color3usv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor3usv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4b) {
-        void **procp = (void **) &disp->Color4b;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4b", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4bv) {
-        void **procp = (void **) &disp->Color4bv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4bv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4d) {
-        void **procp = (void **) &disp->Color4d;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4dv) {
-        void **procp = (void **) &disp->Color4dv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4f) {
-        void **procp = (void **) &disp->Color4f;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4fv) {
-        void **procp = (void **) &disp->Color4fv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4i) {
-        void **procp = (void **) &disp->Color4i;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4iv) {
-        void **procp = (void **) &disp->Color4iv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4s) {
-        void **procp = (void **) &disp->Color4s;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4sv) {
-        void **procp = (void **) &disp->Color4sv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4ub) {
-        void **procp = (void **) &disp->Color4ub;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4ub", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4ubv) {
-        void **procp = (void **) &disp->Color4ubv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4ubv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4ui) {
-        void **procp = (void **) &disp->Color4ui;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4uiv) {
-        void **procp = (void **) &disp->Color4uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4us) {
-        void **procp = (void **) &disp->Color4us;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4us", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Color4usv) {
-        void **procp = (void **) &disp->Color4usv;
-
-        snprintf(symboln, sizeof(symboln), "%sColor4usv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EdgeFlag) {
-        void **procp = (void **) &disp->EdgeFlag;
-
-        snprintf(symboln, sizeof(symboln), "%sEdgeFlag", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EdgeFlagv) {
-        void **procp = (void **) &disp->EdgeFlagv;
-
-        snprintf(symboln, sizeof(symboln), "%sEdgeFlagv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->End) {
-        void **procp = (void **) &disp->End;
-
-        snprintf(symboln, sizeof(symboln), "%sEnd", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Indexd) {
-        void **procp = (void **) &disp->Indexd;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexd", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Indexdv) {
-        void **procp = (void **) &disp->Indexdv;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexdv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Indexf) {
-        void **procp = (void **) &disp->Indexf;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Indexfv) {
-        void **procp = (void **) &disp->Indexfv;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Indexi) {
-        void **procp = (void **) &disp->Indexi;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexi", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Indexiv) {
-        void **procp = (void **) &disp->Indexiv;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Indexs) {
-        void **procp = (void **) &disp->Indexs;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexs", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Indexsv) {
-        void **procp = (void **) &disp->Indexsv;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexsv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Normal3b) {
-        void **procp = (void **) &disp->Normal3b;
-
-        snprintf(symboln, sizeof(symboln), "%sNormal3b", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Normal3bv) {
-        void **procp = (void **) &disp->Normal3bv;
-
-        snprintf(symboln, sizeof(symboln), "%sNormal3bv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Normal3d) {
-        void **procp = (void **) &disp->Normal3d;
-
-        snprintf(symboln, sizeof(symboln), "%sNormal3d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Normal3dv) {
-        void **procp = (void **) &disp->Normal3dv;
-
-        snprintf(symboln, sizeof(symboln), "%sNormal3dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Normal3f) {
-        void **procp = (void **) &disp->Normal3f;
-
-        snprintf(symboln, sizeof(symboln), "%sNormal3f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Normal3fv) {
-        void **procp = (void **) &disp->Normal3fv;
-
-        snprintf(symboln, sizeof(symboln), "%sNormal3fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Normal3i) {
-        void **procp = (void **) &disp->Normal3i;
-
-        snprintf(symboln, sizeof(symboln), "%sNormal3i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Normal3iv) {
-        void **procp = (void **) &disp->Normal3iv;
-
-        snprintf(symboln, sizeof(symboln), "%sNormal3iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Normal3s) {
-        void **procp = (void **) &disp->Normal3s;
-
-        snprintf(symboln, sizeof(symboln), "%sNormal3s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Normal3sv) {
-        void **procp = (void **) &disp->Normal3sv;
-
-        snprintf(symboln, sizeof(symboln), "%sNormal3sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos2d) {
-        void **procp = (void **) &disp->RasterPos2d;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos2d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos2dv) {
-        void **procp = (void **) &disp->RasterPos2dv;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos2dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos2f) {
-        void **procp = (void **) &disp->RasterPos2f;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos2f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos2fv) {
-        void **procp = (void **) &disp->RasterPos2fv;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos2fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos2i) {
-        void **procp = (void **) &disp->RasterPos2i;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos2i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos2iv) {
-        void **procp = (void **) &disp->RasterPos2iv;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos2iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos2s) {
-        void **procp = (void **) &disp->RasterPos2s;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos2s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos2sv) {
-        void **procp = (void **) &disp->RasterPos2sv;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos2sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos3d) {
-        void **procp = (void **) &disp->RasterPos3d;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos3d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos3dv) {
-        void **procp = (void **) &disp->RasterPos3dv;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos3dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos3f) {
-        void **procp = (void **) &disp->RasterPos3f;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos3f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos3fv) {
-        void **procp = (void **) &disp->RasterPos3fv;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos3fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos3i) {
-        void **procp = (void **) &disp->RasterPos3i;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos3i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos3iv) {
-        void **procp = (void **) &disp->RasterPos3iv;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos3iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos3s) {
-        void **procp = (void **) &disp->RasterPos3s;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos3s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos3sv) {
-        void **procp = (void **) &disp->RasterPos3sv;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos3sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos4d) {
-        void **procp = (void **) &disp->RasterPos4d;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos4d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos4dv) {
-        void **procp = (void **) &disp->RasterPos4dv;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos4dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos4f) {
-        void **procp = (void **) &disp->RasterPos4f;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos4f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos4fv) {
-        void **procp = (void **) &disp->RasterPos4fv;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos4fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos4i) {
-        void **procp = (void **) &disp->RasterPos4i;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos4i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos4iv) {
-        void **procp = (void **) &disp->RasterPos4iv;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos4iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos4s) {
-        void **procp = (void **) &disp->RasterPos4s;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos4s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RasterPos4sv) {
-        void **procp = (void **) &disp->RasterPos4sv;
-
-        snprintf(symboln, sizeof(symboln), "%sRasterPos4sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Rectd) {
-        void **procp = (void **) &disp->Rectd;
-
-        snprintf(symboln, sizeof(symboln), "%sRectd", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Rectdv) {
-        void **procp = (void **) &disp->Rectdv;
-
-        snprintf(symboln, sizeof(symboln), "%sRectdv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Rectf) {
-        void **procp = (void **) &disp->Rectf;
-
-        snprintf(symboln, sizeof(symboln), "%sRectf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Rectfv) {
-        void **procp = (void **) &disp->Rectfv;
-
-        snprintf(symboln, sizeof(symboln), "%sRectfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Recti) {
-        void **procp = (void **) &disp->Recti;
-
-        snprintf(symboln, sizeof(symboln), "%sRecti", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Rectiv) {
-        void **procp = (void **) &disp->Rectiv;
-
-        snprintf(symboln, sizeof(symboln), "%sRectiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Rects) {
-        void **procp = (void **) &disp->Rects;
-
-        snprintf(symboln, sizeof(symboln), "%sRects", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Rectsv) {
-        void **procp = (void **) &disp->Rectsv;
-
-        snprintf(symboln, sizeof(symboln), "%sRectsv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord1d) {
-        void **procp = (void **) &disp->TexCoord1d;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord1d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord1dv) {
-        void **procp = (void **) &disp->TexCoord1dv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord1dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord1f) {
-        void **procp = (void **) &disp->TexCoord1f;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord1f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord1fv) {
-        void **procp = (void **) &disp->TexCoord1fv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord1fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord1i) {
-        void **procp = (void **) &disp->TexCoord1i;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord1i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord1iv) {
-        void **procp = (void **) &disp->TexCoord1iv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord1iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord1s) {
-        void **procp = (void **) &disp->TexCoord1s;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord1s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord1sv) {
-        void **procp = (void **) &disp->TexCoord1sv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord1sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord2d) {
-        void **procp = (void **) &disp->TexCoord2d;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord2d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord2dv) {
-        void **procp = (void **) &disp->TexCoord2dv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord2dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord2f) {
-        void **procp = (void **) &disp->TexCoord2f;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord2f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord2fv) {
-        void **procp = (void **) &disp->TexCoord2fv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord2fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord2i) {
-        void **procp = (void **) &disp->TexCoord2i;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord2i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord2iv) {
-        void **procp = (void **) &disp->TexCoord2iv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord2iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord2s) {
-        void **procp = (void **) &disp->TexCoord2s;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord2s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord2sv) {
-        void **procp = (void **) &disp->TexCoord2sv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord2sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord3d) {
-        void **procp = (void **) &disp->TexCoord3d;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord3d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord3dv) {
-        void **procp = (void **) &disp->TexCoord3dv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord3dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord3f) {
-        void **procp = (void **) &disp->TexCoord3f;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord3f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord3fv) {
-        void **procp = (void **) &disp->TexCoord3fv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord3fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord3i) {
-        void **procp = (void **) &disp->TexCoord3i;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord3i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord3iv) {
-        void **procp = (void **) &disp->TexCoord3iv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord3iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord3s) {
-        void **procp = (void **) &disp->TexCoord3s;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord3s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord3sv) {
-        void **procp = (void **) &disp->TexCoord3sv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord3sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord4d) {
-        void **procp = (void **) &disp->TexCoord4d;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord4d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord4dv) {
-        void **procp = (void **) &disp->TexCoord4dv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord4dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord4f) {
-        void **procp = (void **) &disp->TexCoord4f;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord4f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord4fv) {
-        void **procp = (void **) &disp->TexCoord4fv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord4fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord4i) {
-        void **procp = (void **) &disp->TexCoord4i;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord4i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord4iv) {
-        void **procp = (void **) &disp->TexCoord4iv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord4iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord4s) {
-        void **procp = (void **) &disp->TexCoord4s;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord4s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoord4sv) {
-        void **procp = (void **) &disp->TexCoord4sv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoord4sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex2d) {
-        void **procp = (void **) &disp->Vertex2d;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex2d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex2dv) {
-        void **procp = (void **) &disp->Vertex2dv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex2dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex2f) {
-        void **procp = (void **) &disp->Vertex2f;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex2f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex2fv) {
-        void **procp = (void **) &disp->Vertex2fv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex2fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex2i) {
-        void **procp = (void **) &disp->Vertex2i;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex2i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex2iv) {
-        void **procp = (void **) &disp->Vertex2iv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex2iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex2s) {
-        void **procp = (void **) &disp->Vertex2s;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex2s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex2sv) {
-        void **procp = (void **) &disp->Vertex2sv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex2sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex3d) {
-        void **procp = (void **) &disp->Vertex3d;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex3d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex3dv) {
-        void **procp = (void **) &disp->Vertex3dv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex3dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex3f) {
-        void **procp = (void **) &disp->Vertex3f;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex3f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex3fv) {
-        void **procp = (void **) &disp->Vertex3fv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex3fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex3i) {
-        void **procp = (void **) &disp->Vertex3i;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex3i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex3iv) {
-        void **procp = (void **) &disp->Vertex3iv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex3iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex3s) {
-        void **procp = (void **) &disp->Vertex3s;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex3s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex3sv) {
-        void **procp = (void **) &disp->Vertex3sv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex3sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex4d) {
-        void **procp = (void **) &disp->Vertex4d;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex4d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex4dv) {
-        void **procp = (void **) &disp->Vertex4dv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex4dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex4f) {
-        void **procp = (void **) &disp->Vertex4f;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex4f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex4fv) {
-        void **procp = (void **) &disp->Vertex4fv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex4fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex4i) {
-        void **procp = (void **) &disp->Vertex4i;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex4i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex4iv) {
-        void **procp = (void **) &disp->Vertex4iv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex4iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex4s) {
-        void **procp = (void **) &disp->Vertex4s;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex4s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Vertex4sv) {
-        void **procp = (void **) &disp->Vertex4sv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertex4sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClipPlane) {
-        void **procp = (void **) &disp->ClipPlane;
-
-        snprintf(symboln, sizeof(symboln), "%sClipPlane", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorMaterial) {
-        void **procp = (void **) &disp->ColorMaterial;
-
-        snprintf(symboln, sizeof(symboln), "%sColorMaterial", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CullFace) {
-        void **procp = (void **) &disp->CullFace;
-
-        snprintf(symboln, sizeof(symboln), "%sCullFace", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Fogf) {
-        void **procp = (void **) &disp->Fogf;
-
-        snprintf(symboln, sizeof(symboln), "%sFogf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Fogfv) {
-        void **procp = (void **) &disp->Fogfv;
-
-        snprintf(symboln, sizeof(symboln), "%sFogfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Fogi) {
-        void **procp = (void **) &disp->Fogi;
-
-        snprintf(symboln, sizeof(symboln), "%sFogi", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Fogiv) {
-        void **procp = (void **) &disp->Fogiv;
-
-        snprintf(symboln, sizeof(symboln), "%sFogiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FrontFace) {
-        void **procp = (void **) &disp->FrontFace;
-
-        snprintf(symboln, sizeof(symboln), "%sFrontFace", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Hint) {
-        void **procp = (void **) &disp->Hint;
-
-        snprintf(symboln, sizeof(symboln), "%sHint", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Lightf) {
-        void **procp = (void **) &disp->Lightf;
-
-        snprintf(symboln, sizeof(symboln), "%sLightf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Lightfv) {
-        void **procp = (void **) &disp->Lightfv;
-
-        snprintf(symboln, sizeof(symboln), "%sLightfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Lighti) {
-        void **procp = (void **) &disp->Lighti;
-
-        snprintf(symboln, sizeof(symboln), "%sLighti", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Lightiv) {
-        void **procp = (void **) &disp->Lightiv;
-
-        snprintf(symboln, sizeof(symboln), "%sLightiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LightModelf) {
-        void **procp = (void **) &disp->LightModelf;
-
-        snprintf(symboln, sizeof(symboln), "%sLightModelf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LightModelfv) {
-        void **procp = (void **) &disp->LightModelfv;
-
-        snprintf(symboln, sizeof(symboln), "%sLightModelfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LightModeli) {
-        void **procp = (void **) &disp->LightModeli;
-
-        snprintf(symboln, sizeof(symboln), "%sLightModeli", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LightModeliv) {
-        void **procp = (void **) &disp->LightModeliv;
-
-        snprintf(symboln, sizeof(symboln), "%sLightModeliv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LineStipple) {
-        void **procp = (void **) &disp->LineStipple;
-
-        snprintf(symboln, sizeof(symboln), "%sLineStipple", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LineWidth) {
-        void **procp = (void **) &disp->LineWidth;
-
-        snprintf(symboln, sizeof(symboln), "%sLineWidth", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Materialf) {
-        void **procp = (void **) &disp->Materialf;
-
-        snprintf(symboln, sizeof(symboln), "%sMaterialf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Materialfv) {
-        void **procp = (void **) &disp->Materialfv;
-
-        snprintf(symboln, sizeof(symboln), "%sMaterialfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Materiali) {
-        void **procp = (void **) &disp->Materiali;
-
-        snprintf(symboln, sizeof(symboln), "%sMateriali", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Materialiv) {
-        void **procp = (void **) &disp->Materialiv;
-
-        snprintf(symboln, sizeof(symboln), "%sMaterialiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointSize) {
-        void **procp = (void **) &disp->PointSize;
-
-        snprintf(symboln, sizeof(symboln), "%sPointSize", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PolygonMode) {
-        void **procp = (void **) &disp->PolygonMode;
-
-        snprintf(symboln, sizeof(symboln), "%sPolygonMode", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PolygonStipple) {
-        void **procp = (void **) &disp->PolygonStipple;
-
-        snprintf(symboln, sizeof(symboln), "%sPolygonStipple", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Scissor) {
-        void **procp = (void **) &disp->Scissor;
-
-        snprintf(symboln, sizeof(symboln), "%sScissor", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ShadeModel) {
-        void **procp = (void **) &disp->ShadeModel;
-
-        snprintf(symboln, sizeof(symboln), "%sShadeModel", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexParameterf) {
-        void **procp = (void **) &disp->TexParameterf;
-
-        snprintf(symboln, sizeof(symboln), "%sTexParameterf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexParameterfv) {
-        void **procp = (void **) &disp->TexParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexParameterfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexParameteri) {
-        void **procp = (void **) &disp->TexParameteri;
-
-        snprintf(symboln, sizeof(symboln), "%sTexParameteri", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexParameteriv) {
-        void **procp = (void **) &disp->TexParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexParameteriv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexImage1D) {
-        void **procp = (void **) &disp->TexImage1D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexImage1D", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexImage2D) {
-        void **procp = (void **) &disp->TexImage2D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexImage2D", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexEnvf) {
-        void **procp = (void **) &disp->TexEnvf;
-
-        snprintf(symboln, sizeof(symboln), "%sTexEnvf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexEnvfv) {
-        void **procp = (void **) &disp->TexEnvfv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexEnvfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexEnvi) {
-        void **procp = (void **) &disp->TexEnvi;
-
-        snprintf(symboln, sizeof(symboln), "%sTexEnvi", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexEnviv) {
-        void **procp = (void **) &disp->TexEnviv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexEnviv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexGend) {
-        void **procp = (void **) &disp->TexGend;
-
-        snprintf(symboln, sizeof(symboln), "%sTexGend", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexGendv) {
-        void **procp = (void **) &disp->TexGendv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexGendv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexGenf) {
-        void **procp = (void **) &disp->TexGenf;
-
-        snprintf(symboln, sizeof(symboln), "%sTexGenf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexGenfv) {
-        void **procp = (void **) &disp->TexGenfv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexGenfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexGeni) {
-        void **procp = (void **) &disp->TexGeni;
-
-        snprintf(symboln, sizeof(symboln), "%sTexGeni", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexGeniv) {
-        void **procp = (void **) &disp->TexGeniv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexGeniv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FeedbackBuffer) {
-        void **procp = (void **) &disp->FeedbackBuffer;
-
-        snprintf(symboln, sizeof(symboln), "%sFeedbackBuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SelectBuffer) {
-        void **procp = (void **) &disp->SelectBuffer;
-
-        snprintf(symboln, sizeof(symboln), "%sSelectBuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RenderMode) {
-        void **procp = (void **) &disp->RenderMode;
-
-        snprintf(symboln, sizeof(symboln), "%sRenderMode", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->InitNames) {
-        void **procp = (void **) &disp->InitNames;
-
-        snprintf(symboln, sizeof(symboln), "%sInitNames", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LoadName) {
-        void **procp = (void **) &disp->LoadName;
-
-        snprintf(symboln, sizeof(symboln), "%sLoadName", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PassThrough) {
-        void **procp = (void **) &disp->PassThrough;
-
-        snprintf(symboln, sizeof(symboln), "%sPassThrough", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PopName) {
-        void **procp = (void **) &disp->PopName;
-
-        snprintf(symboln, sizeof(symboln), "%sPopName", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PushName) {
-        void **procp = (void **) &disp->PushName;
-
-        snprintf(symboln, sizeof(symboln), "%sPushName", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawBuffer) {
-        void **procp = (void **) &disp->DrawBuffer;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawBuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Clear) {
-        void **procp = (void **) &disp->Clear;
-
-        snprintf(symboln, sizeof(symboln), "%sClear", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClearAccum) {
-        void **procp = (void **) &disp->ClearAccum;
-
-        snprintf(symboln, sizeof(symboln), "%sClearAccum", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClearIndex) {
-        void **procp = (void **) &disp->ClearIndex;
-
-        snprintf(symboln, sizeof(symboln), "%sClearIndex", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClearColor) {
-        void **procp = (void **) &disp->ClearColor;
-
-        snprintf(symboln, sizeof(symboln), "%sClearColor", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClearStencil) {
-        void **procp = (void **) &disp->ClearStencil;
-
-        snprintf(symboln, sizeof(symboln), "%sClearStencil", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClearDepth) {
-        void **procp = (void **) &disp->ClearDepth;
-
-        snprintf(symboln, sizeof(symboln), "%sClearDepth", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->StencilMask) {
-        void **procp = (void **) &disp->StencilMask;
-
-        snprintf(symboln, sizeof(symboln), "%sStencilMask", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorMask) {
-        void **procp = (void **) &disp->ColorMask;
-
-        snprintf(symboln, sizeof(symboln), "%sColorMask", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DepthMask) {
-        void **procp = (void **) &disp->DepthMask;
-
-        snprintf(symboln, sizeof(symboln), "%sDepthMask", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IndexMask) {
-        void **procp = (void **) &disp->IndexMask;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexMask", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Accum) {
-        void **procp = (void **) &disp->Accum;
-
-        snprintf(symboln, sizeof(symboln), "%sAccum", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Disable) {
-        void **procp = (void **) &disp->Disable;
-
-        snprintf(symboln, sizeof(symboln), "%sDisable", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Enable) {
-        void **procp = (void **) &disp->Enable;
-
-        snprintf(symboln, sizeof(symboln), "%sEnable", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Finish) {
-        void **procp = (void **) &disp->Finish;
-
-        snprintf(symboln, sizeof(symboln), "%sFinish", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Flush) {
-        void **procp = (void **) &disp->Flush;
-
-        snprintf(symboln, sizeof(symboln), "%sFlush", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PopAttrib) {
-        void **procp = (void **) &disp->PopAttrib;
-
-        snprintf(symboln, sizeof(symboln), "%sPopAttrib", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PushAttrib) {
-        void **procp = (void **) &disp->PushAttrib;
-
-        snprintf(symboln, sizeof(symboln), "%sPushAttrib", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Map1d) {
-        void **procp = (void **) &disp->Map1d;
-
-        snprintf(symboln, sizeof(symboln), "%sMap1d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Map1f) {
-        void **procp = (void **) &disp->Map1f;
-
-        snprintf(symboln, sizeof(symboln), "%sMap1f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Map2d) {
-        void **procp = (void **) &disp->Map2d;
-
-        snprintf(symboln, sizeof(symboln), "%sMap2d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Map2f) {
-        void **procp = (void **) &disp->Map2f;
-
-        snprintf(symboln, sizeof(symboln), "%sMap2f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MapGrid1d) {
-        void **procp = (void **) &disp->MapGrid1d;
-
-        snprintf(symboln, sizeof(symboln), "%sMapGrid1d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MapGrid1f) {
-        void **procp = (void **) &disp->MapGrid1f;
-
-        snprintf(symboln, sizeof(symboln), "%sMapGrid1f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MapGrid2d) {
-        void **procp = (void **) &disp->MapGrid2d;
-
-        snprintf(symboln, sizeof(symboln), "%sMapGrid2d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MapGrid2f) {
-        void **procp = (void **) &disp->MapGrid2f;
-
-        snprintf(symboln, sizeof(symboln), "%sMapGrid2f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EvalCoord1d) {
-        void **procp = (void **) &disp->EvalCoord1d;
-
-        snprintf(symboln, sizeof(symboln), "%sEvalCoord1d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EvalCoord1dv) {
-        void **procp = (void **) &disp->EvalCoord1dv;
-
-        snprintf(symboln, sizeof(symboln), "%sEvalCoord1dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EvalCoord1f) {
-        void **procp = (void **) &disp->EvalCoord1f;
-
-        snprintf(symboln, sizeof(symboln), "%sEvalCoord1f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EvalCoord1fv) {
-        void **procp = (void **) &disp->EvalCoord1fv;
-
-        snprintf(symboln, sizeof(symboln), "%sEvalCoord1fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EvalCoord2d) {
-        void **procp = (void **) &disp->EvalCoord2d;
-
-        snprintf(symboln, sizeof(symboln), "%sEvalCoord2d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EvalCoord2dv) {
-        void **procp = (void **) &disp->EvalCoord2dv;
-
-        snprintf(symboln, sizeof(symboln), "%sEvalCoord2dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EvalCoord2f) {
-        void **procp = (void **) &disp->EvalCoord2f;
-
-        snprintf(symboln, sizeof(symboln), "%sEvalCoord2f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EvalCoord2fv) {
-        void **procp = (void **) &disp->EvalCoord2fv;
-
-        snprintf(symboln, sizeof(symboln), "%sEvalCoord2fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EvalMesh1) {
-        void **procp = (void **) &disp->EvalMesh1;
-
-        snprintf(symboln, sizeof(symboln), "%sEvalMesh1", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EvalPoint1) {
-        void **procp = (void **) &disp->EvalPoint1;
-
-        snprintf(symboln, sizeof(symboln), "%sEvalPoint1", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EvalMesh2) {
-        void **procp = (void **) &disp->EvalMesh2;
-
-        snprintf(symboln, sizeof(symboln), "%sEvalMesh2", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EvalPoint2) {
-        void **procp = (void **) &disp->EvalPoint2;
-
-        snprintf(symboln, sizeof(symboln), "%sEvalPoint2", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->AlphaFunc) {
-        void **procp = (void **) &disp->AlphaFunc;
-
-        snprintf(symboln, sizeof(symboln), "%sAlphaFunc", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendFunc) {
-        void **procp = (void **) &disp->BlendFunc;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendFunc", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LogicOp) {
-        void **procp = (void **) &disp->LogicOp;
-
-        snprintf(symboln, sizeof(symboln), "%sLogicOp", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->StencilFunc) {
-        void **procp = (void **) &disp->StencilFunc;
-
-        snprintf(symboln, sizeof(symboln), "%sStencilFunc", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->StencilOp) {
-        void **procp = (void **) &disp->StencilOp;
-
-        snprintf(symboln, sizeof(symboln), "%sStencilOp", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DepthFunc) {
-        void **procp = (void **) &disp->DepthFunc;
-
-        snprintf(symboln, sizeof(symboln), "%sDepthFunc", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelZoom) {
-        void **procp = (void **) &disp->PixelZoom;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelZoom", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelTransferf) {
-        void **procp = (void **) &disp->PixelTransferf;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelTransferf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelTransferi) {
-        void **procp = (void **) &disp->PixelTransferi;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelTransferi", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelStoref) {
-        void **procp = (void **) &disp->PixelStoref;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelStoref", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelStorei) {
-        void **procp = (void **) &disp->PixelStorei;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelStorei", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelMapfv) {
-        void **procp = (void **) &disp->PixelMapfv;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelMapfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelMapuiv) {
-        void **procp = (void **) &disp->PixelMapuiv;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelMapuiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelMapusv) {
-        void **procp = (void **) &disp->PixelMapusv;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelMapusv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ReadBuffer) {
-        void **procp = (void **) &disp->ReadBuffer;
-
-        snprintf(symboln, sizeof(symboln), "%sReadBuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyPixels) {
-        void **procp = (void **) &disp->CopyPixels;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyPixels", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ReadPixels) {
-        void **procp = (void **) &disp->ReadPixels;
-
-        snprintf(symboln, sizeof(symboln), "%sReadPixels", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawPixels) {
-        void **procp = (void **) &disp->DrawPixels;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawPixels", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetBooleanv) {
-        void **procp = (void **) &disp->GetBooleanv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetBooleanv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetClipPlane) {
-        void **procp = (void **) &disp->GetClipPlane;
-
-        snprintf(symboln, sizeof(symboln), "%sGetClipPlane", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetDoublev) {
-        void **procp = (void **) &disp->GetDoublev;
-
-        snprintf(symboln, sizeof(symboln), "%sGetDoublev", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetError) {
-        void **procp = (void **) &disp->GetError;
-
-        snprintf(symboln, sizeof(symboln), "%sGetError", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetFloatv) {
-        void **procp = (void **) &disp->GetFloatv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetFloatv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetIntegerv) {
-        void **procp = (void **) &disp->GetIntegerv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetIntegerv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetLightfv) {
-        void **procp = (void **) &disp->GetLightfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetLightfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetLightiv) {
-        void **procp = (void **) &disp->GetLightiv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetLightiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetMapdv) {
-        void **procp = (void **) &disp->GetMapdv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetMapdv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetMapfv) {
-        void **procp = (void **) &disp->GetMapfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetMapfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetMapiv) {
-        void **procp = (void **) &disp->GetMapiv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetMapiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetMaterialfv) {
-        void **procp = (void **) &disp->GetMaterialfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetMaterialfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetMaterialiv) {
-        void **procp = (void **) &disp->GetMaterialiv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetMaterialiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetPixelMapfv) {
-        void **procp = (void **) &disp->GetPixelMapfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetPixelMapfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetPixelMapuiv) {
-        void **procp = (void **) &disp->GetPixelMapuiv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetPixelMapuiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetPixelMapusv) {
-        void **procp = (void **) &disp->GetPixelMapusv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetPixelMapusv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetPolygonStipple) {
-        void **procp = (void **) &disp->GetPolygonStipple;
-
-        snprintf(symboln, sizeof(symboln), "%sGetPolygonStipple",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetString) {
-        void **procp = (void **) &disp->GetString;
-
-        snprintf(symboln, sizeof(symboln), "%sGetString", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexEnvfv) {
-        void **procp = (void **) &disp->GetTexEnvfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexEnvfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexEnviv) {
-        void **procp = (void **) &disp->GetTexEnviv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexEnviv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexGendv) {
-        void **procp = (void **) &disp->GetTexGendv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexGendv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexGenfv) {
-        void **procp = (void **) &disp->GetTexGenfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexGenfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexGeniv) {
-        void **procp = (void **) &disp->GetTexGeniv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexGeniv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexImage) {
-        void **procp = (void **) &disp->GetTexImage;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexImage", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexParameterfv) {
-        void **procp = (void **) &disp->GetTexParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameterfv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexParameteriv) {
-        void **procp = (void **) &disp->GetTexParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameteriv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexLevelParameterfv) {
-        void **procp = (void **) &disp->GetTexLevelParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexLevelParameterfv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexLevelParameteriv) {
-        void **procp = (void **) &disp->GetTexLevelParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexLevelParameteriv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsEnabled) {
-        void **procp = (void **) &disp->IsEnabled;
-
-        snprintf(symboln, sizeof(symboln), "%sIsEnabled", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsList) {
-        void **procp = (void **) &disp->IsList;
-
-        snprintf(symboln, sizeof(symboln), "%sIsList", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DepthRange) {
-        void **procp = (void **) &disp->DepthRange;
-
-        snprintf(symboln, sizeof(symboln), "%sDepthRange", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Frustum) {
-        void **procp = (void **) &disp->Frustum;
-
-        snprintf(symboln, sizeof(symboln), "%sFrustum", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LoadIdentity) {
-        void **procp = (void **) &disp->LoadIdentity;
-
-        snprintf(symboln, sizeof(symboln), "%sLoadIdentity", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LoadMatrixf) {
-        void **procp = (void **) &disp->LoadMatrixf;
-
-        snprintf(symboln, sizeof(symboln), "%sLoadMatrixf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LoadMatrixd) {
-        void **procp = (void **) &disp->LoadMatrixd;
-
-        snprintf(symboln, sizeof(symboln), "%sLoadMatrixd", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MatrixMode) {
-        void **procp = (void **) &disp->MatrixMode;
-
-        snprintf(symboln, sizeof(symboln), "%sMatrixMode", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultMatrixf) {
-        void **procp = (void **) &disp->MultMatrixf;
-
-        snprintf(symboln, sizeof(symboln), "%sMultMatrixf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultMatrixd) {
-        void **procp = (void **) &disp->MultMatrixd;
-
-        snprintf(symboln, sizeof(symboln), "%sMultMatrixd", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Ortho) {
-        void **procp = (void **) &disp->Ortho;
-
-        snprintf(symboln, sizeof(symboln), "%sOrtho", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PopMatrix) {
-        void **procp = (void **) &disp->PopMatrix;
-
-        snprintf(symboln, sizeof(symboln), "%sPopMatrix", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PushMatrix) {
-        void **procp = (void **) &disp->PushMatrix;
-
-        snprintf(symboln, sizeof(symboln), "%sPushMatrix", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Rotated) {
-        void **procp = (void **) &disp->Rotated;
-
-        snprintf(symboln, sizeof(symboln), "%sRotated", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Rotatef) {
-        void **procp = (void **) &disp->Rotatef;
-
-        snprintf(symboln, sizeof(symboln), "%sRotatef", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Scaled) {
-        void **procp = (void **) &disp->Scaled;
-
-        snprintf(symboln, sizeof(symboln), "%sScaled", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Scalef) {
-        void **procp = (void **) &disp->Scalef;
-
-        snprintf(symboln, sizeof(symboln), "%sScalef", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Translated) {
-        void **procp = (void **) &disp->Translated;
-
-        snprintf(symboln, sizeof(symboln), "%sTranslated", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Translatef) {
-        void **procp = (void **) &disp->Translatef;
-
-        snprintf(symboln, sizeof(symboln), "%sTranslatef", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Viewport) {
-        void **procp = (void **) &disp->Viewport;
-
-        snprintf(symboln, sizeof(symboln), "%sViewport", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ArrayElement) {
-        void **procp = (void **) &disp->ArrayElement;
-
-        snprintf(symboln, sizeof(symboln), "%sArrayElement", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ArrayElement) {
-        void **procp = (void **) &disp->ArrayElement;
-
-        snprintf(symboln, sizeof(symboln), "%sArrayElementEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindTexture) {
-        void **procp = (void **) &disp->BindTexture;
-
-        snprintf(symboln, sizeof(symboln), "%sBindTexture", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindTexture) {
-        void **procp = (void **) &disp->BindTexture;
-
-        snprintf(symboln, sizeof(symboln), "%sBindTextureEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorPointer) {
-        void **procp = (void **) &disp->ColorPointer;
-
-        snprintf(symboln, sizeof(symboln), "%sColorPointer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DisableClientState) {
-        void **procp = (void **) &disp->DisableClientState;
-
-        snprintf(symboln, sizeof(symboln), "%sDisableClientState",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawArrays) {
-        void **procp = (void **) &disp->DrawArrays;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawArrays", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawArrays) {
-        void **procp = (void **) &disp->DrawArrays;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawArraysEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawElements) {
-        void **procp = (void **) &disp->DrawElements;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawElements", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EdgeFlagPointer) {
-        void **procp = (void **) &disp->EdgeFlagPointer;
-
-        snprintf(symboln, sizeof(symboln), "%sEdgeFlagPointer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EnableClientState) {
-        void **procp = (void **) &disp->EnableClientState;
-
-        snprintf(symboln, sizeof(symboln), "%sEnableClientState",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IndexPointer) {
-        void **procp = (void **) &disp->IndexPointer;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexPointer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Indexub) {
-        void **procp = (void **) &disp->Indexub;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexub", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Indexubv) {
-        void **procp = (void **) &disp->Indexubv;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexubv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->InterleavedArrays) {
-        void **procp = (void **) &disp->InterleavedArrays;
-
-        snprintf(symboln, sizeof(symboln), "%sInterleavedArrays",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->NormalPointer) {
-        void **procp = (void **) &disp->NormalPointer;
-
-        snprintf(symboln, sizeof(symboln), "%sNormalPointer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PolygonOffset) {
-        void **procp = (void **) &disp->PolygonOffset;
-
-        snprintf(symboln, sizeof(symboln), "%sPolygonOffset", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoordPointer) {
-        void **procp = (void **) &disp->TexCoordPointer;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoordPointer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexPointer) {
-        void **procp = (void **) &disp->VertexPointer;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexPointer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->AreTexturesResident) {
-        void **procp = (void **) &disp->AreTexturesResident;
-
-        snprintf(symboln, sizeof(symboln), "%sAreTexturesResident",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->AreTexturesResident) {
-        void **procp = (void **) &disp->AreTexturesResident;
-
-        snprintf(symboln, sizeof(symboln), "%sAreTexturesResidentEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyTexImage1D) {
-        void **procp = (void **) &disp->CopyTexImage1D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyTexImage1D", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyTexImage1D) {
-        void **procp = (void **) &disp->CopyTexImage1D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyTexImage1DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyTexImage2D) {
-        void **procp = (void **) &disp->CopyTexImage2D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyTexImage2D", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyTexImage2D) {
-        void **procp = (void **) &disp->CopyTexImage2D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyTexImage2DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyTexSubImage1D) {
-        void **procp = (void **) &disp->CopyTexSubImage1D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage1D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyTexSubImage1D) {
-        void **procp = (void **) &disp->CopyTexSubImage1D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage1DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyTexSubImage2D) {
-        void **procp = (void **) &disp->CopyTexSubImage2D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage2D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyTexSubImage2D) {
-        void **procp = (void **) &disp->CopyTexSubImage2D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage2DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteTextures) {
-        void **procp = (void **) &disp->DeleteTextures;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteTextures", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteTextures) {
-        void **procp = (void **) &disp->DeleteTextures;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteTexturesEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenTextures) {
-        void **procp = (void **) &disp->GenTextures;
-
-        snprintf(symboln, sizeof(symboln), "%sGenTextures", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenTextures) {
-        void **procp = (void **) &disp->GenTextures;
-
-        snprintf(symboln, sizeof(symboln), "%sGenTexturesEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetPointerv) {
-        void **procp = (void **) &disp->GetPointerv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetPointerv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetPointerv) {
-        void **procp = (void **) &disp->GetPointerv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetPointervEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsTexture) {
-        void **procp = (void **) &disp->IsTexture;
-
-        snprintf(symboln, sizeof(symboln), "%sIsTexture", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsTexture) {
-        void **procp = (void **) &disp->IsTexture;
-
-        snprintf(symboln, sizeof(symboln), "%sIsTextureEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PrioritizeTextures) {
-        void **procp = (void **) &disp->PrioritizeTextures;
-
-        snprintf(symboln, sizeof(symboln), "%sPrioritizeTextures",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PrioritizeTextures) {
-        void **procp = (void **) &disp->PrioritizeTextures;
-
-        snprintf(symboln, sizeof(symboln), "%sPrioritizeTexturesEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexSubImage1D) {
-        void **procp = (void **) &disp->TexSubImage1D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexSubImage1D", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexSubImage1D) {
-        void **procp = (void **) &disp->TexSubImage1D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexSubImage1DEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexSubImage2D) {
-        void **procp = (void **) &disp->TexSubImage2D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexSubImage2D", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexSubImage2D) {
-        void **procp = (void **) &disp->TexSubImage2D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexSubImage2DEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PopClientAttrib) {
-        void **procp = (void **) &disp->PopClientAttrib;
-
-        snprintf(symboln, sizeof(symboln), "%sPopClientAttrib", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PushClientAttrib) {
-        void **procp = (void **) &disp->PushClientAttrib;
-
-        snprintf(symboln, sizeof(symboln), "%sPushClientAttrib", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendColor) {
-        void **procp = (void **) &disp->BlendColor;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendColor", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendColor) {
-        void **procp = (void **) &disp->BlendColor;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendColorEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendEquation) {
-        void **procp = (void **) &disp->BlendEquation;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendEquation", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendEquation) {
-        void **procp = (void **) &disp->BlendEquation;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawRangeElements) {
-        void **procp = (void **) &disp->DrawRangeElements;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawRangeElements",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawRangeElements) {
-        void **procp = (void **) &disp->DrawRangeElements;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawRangeElementsEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorTable) {
-        void **procp = (void **) &disp->ColorTable;
-
-        snprintf(symboln, sizeof(symboln), "%sColorTable", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorTable) {
-        void **procp = (void **) &disp->ColorTable;
-
-        snprintf(symboln, sizeof(symboln), "%sColorTableSGI", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorTable) {
-        void **procp = (void **) &disp->ColorTable;
-
-        snprintf(symboln, sizeof(symboln), "%sColorTableEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorTableParameterfv) {
-        void **procp = (void **) &disp->ColorTableParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sColorTableParameterfv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorTableParameterfv) {
-        void **procp = (void **) &disp->ColorTableParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sColorTableParameterfvSGI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorTableParameteriv) {
-        void **procp = (void **) &disp->ColorTableParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sColorTableParameteriv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorTableParameteriv) {
-        void **procp = (void **) &disp->ColorTableParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sColorTableParameterivSGI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyColorTable) {
-        void **procp = (void **) &disp->CopyColorTable;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyColorTable", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyColorTable) {
-        void **procp = (void **) &disp->CopyColorTable;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyColorTableSGI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetColorTable) {
-        void **procp = (void **) &disp->GetColorTable;
-
-        snprintf(symboln, sizeof(symboln), "%sGetColorTable", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetColorTable) {
-        void **procp = (void **) &disp->GetColorTable;
-
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableSGI", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetColorTable) {
-        void **procp = (void **) &disp->GetColorTable;
-
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetColorTableParameterfv) {
-        void **procp = (void **) &disp->GetColorTableParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterfv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetColorTableParameterfv) {
-        void **procp = (void **) &disp->GetColorTableParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterfvSGI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetColorTableParameterfv) {
-        void **procp = (void **) &disp->GetColorTableParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterfvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetColorTableParameteriv) {
-        void **procp = (void **) &disp->GetColorTableParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameteriv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetColorTableParameteriv) {
-        void **procp = (void **) &disp->GetColorTableParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterivSGI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetColorTableParameteriv) {
-        void **procp = (void **) &disp->GetColorTableParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorSubTable) {
-        void **procp = (void **) &disp->ColorSubTable;
-
-        snprintf(symboln, sizeof(symboln), "%sColorSubTable", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorSubTable) {
-        void **procp = (void **) &disp->ColorSubTable;
-
-        snprintf(symboln, sizeof(symboln), "%sColorSubTableEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyColorSubTable) {
-        void **procp = (void **) &disp->CopyColorSubTable;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyColorSubTable",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyColorSubTable) {
-        void **procp = (void **) &disp->CopyColorSubTable;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyColorSubTableEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ConvolutionFilter1D) {
-        void **procp = (void **) &disp->ConvolutionFilter1D;
-
-        snprintf(symboln, sizeof(symboln), "%sConvolutionFilter1D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ConvolutionFilter1D) {
-        void **procp = (void **) &disp->ConvolutionFilter1D;
-
-        snprintf(symboln, sizeof(symboln), "%sConvolutionFilter1DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ConvolutionFilter2D) {
-        void **procp = (void **) &disp->ConvolutionFilter2D;
-
-        snprintf(symboln, sizeof(symboln), "%sConvolutionFilter2D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ConvolutionFilter2D) {
-        void **procp = (void **) &disp->ConvolutionFilter2D;
-
-        snprintf(symboln, sizeof(symboln), "%sConvolutionFilter2DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ConvolutionParameterf) {
-        void **procp = (void **) &disp->ConvolutionParameterf;
-
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterf",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ConvolutionParameterf) {
-        void **procp = (void **) &disp->ConvolutionParameterf;
-
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterfEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ConvolutionParameterfv) {
-        void **procp = (void **) &disp->ConvolutionParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterfv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ConvolutionParameterfv) {
-        void **procp = (void **) &disp->ConvolutionParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterfvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ConvolutionParameteri) {
-        void **procp = (void **) &disp->ConvolutionParameteri;
-
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameteri",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ConvolutionParameteri) {
-        void **procp = (void **) &disp->ConvolutionParameteri;
-
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameteriEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ConvolutionParameteriv) {
-        void **procp = (void **) &disp->ConvolutionParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameteriv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ConvolutionParameteriv) {
-        void **procp = (void **) &disp->ConvolutionParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyConvolutionFilter1D) {
-        void **procp = (void **) &disp->CopyConvolutionFilter1D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyConvolutionFilter1D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyConvolutionFilter1D) {
-        void **procp = (void **) &disp->CopyConvolutionFilter1D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyConvolutionFilter1DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyConvolutionFilter2D) {
-        void **procp = (void **) &disp->CopyConvolutionFilter2D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyConvolutionFilter2D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyConvolutionFilter2D) {
-        void **procp = (void **) &disp->CopyConvolutionFilter2D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyConvolutionFilter2DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetConvolutionFilter) {
-        void **procp = (void **) &disp->GetConvolutionFilter;
-
-        snprintf(symboln, sizeof(symboln), "%sGetConvolutionFilter",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetConvolutionFilter) {
-        void **procp = (void **) &disp->GetConvolutionFilter;
-
-        snprintf(symboln, sizeof(symboln), "%sGetConvolutionFilterEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetConvolutionParameterfv) {
-        void **procp = (void **) &disp->GetConvolutionParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetConvolutionParameterfv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetConvolutionParameterfv) {
-        void **procp = (void **) &disp->GetConvolutionParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetConvolutionParameterfvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetConvolutionParameteriv) {
-        void **procp = (void **) &disp->GetConvolutionParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetConvolutionParameteriv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetConvolutionParameteriv) {
-        void **procp = (void **) &disp->GetConvolutionParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetConvolutionParameterivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetSeparableFilter) {
-        void **procp = (void **) &disp->GetSeparableFilter;
-
-        snprintf(symboln, sizeof(symboln), "%sGetSeparableFilter",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetSeparableFilter) {
-        void **procp = (void **) &disp->GetSeparableFilter;
-
-        snprintf(symboln, sizeof(symboln), "%sGetSeparableFilterEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SeparableFilter2D) {
-        void **procp = (void **) &disp->SeparableFilter2D;
-
-        snprintf(symboln, sizeof(symboln), "%sSeparableFilter2D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SeparableFilter2D) {
-        void **procp = (void **) &disp->SeparableFilter2D;
-
-        snprintf(symboln, sizeof(symboln), "%sSeparableFilter2DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetHistogram) {
-        void **procp = (void **) &disp->GetHistogram;
-
-        snprintf(symboln, sizeof(symboln), "%sGetHistogram", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetHistogram) {
-        void **procp = (void **) &disp->GetHistogram;
-
-        snprintf(symboln, sizeof(symboln), "%sGetHistogramEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetHistogramParameterfv) {
-        void **procp = (void **) &disp->GetHistogramParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetHistogramParameterfv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetHistogramParameterfv) {
-        void **procp = (void **) &disp->GetHistogramParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetHistogramParameterfvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetHistogramParameteriv) {
-        void **procp = (void **) &disp->GetHistogramParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetHistogramParameteriv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetHistogramParameteriv) {
-        void **procp = (void **) &disp->GetHistogramParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetHistogramParameterivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetMinmax) {
-        void **procp = (void **) &disp->GetMinmax;
-
-        snprintf(symboln, sizeof(symboln), "%sGetMinmax", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetMinmax) {
-        void **procp = (void **) &disp->GetMinmax;
-
-        snprintf(symboln, sizeof(symboln), "%sGetMinmaxEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetMinmaxParameterfv) {
-        void **procp = (void **) &disp->GetMinmaxParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetMinmaxParameterfv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetMinmaxParameterfv) {
-        void **procp = (void **) &disp->GetMinmaxParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetMinmaxParameterfvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetMinmaxParameteriv) {
-        void **procp = (void **) &disp->GetMinmaxParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetMinmaxParameteriv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetMinmaxParameteriv) {
-        void **procp = (void **) &disp->GetMinmaxParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetMinmaxParameterivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Histogram) {
-        void **procp = (void **) &disp->Histogram;
-
-        snprintf(symboln, sizeof(symboln), "%sHistogram", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Histogram) {
-        void **procp = (void **) &disp->Histogram;
-
-        snprintf(symboln, sizeof(symboln), "%sHistogramEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Minmax) {
-        void **procp = (void **) &disp->Minmax;
-
-        snprintf(symboln, sizeof(symboln), "%sMinmax", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Minmax) {
-        void **procp = (void **) &disp->Minmax;
-
-        snprintf(symboln, sizeof(symboln), "%sMinmaxEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ResetHistogram) {
-        void **procp = (void **) &disp->ResetHistogram;
-
-        snprintf(symboln, sizeof(symboln), "%sResetHistogram", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ResetHistogram) {
-        void **procp = (void **) &disp->ResetHistogram;
-
-        snprintf(symboln, sizeof(symboln), "%sResetHistogramEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ResetMinmax) {
-        void **procp = (void **) &disp->ResetMinmax;
-
-        snprintf(symboln, sizeof(symboln), "%sResetMinmax", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ResetMinmax) {
-        void **procp = (void **) &disp->ResetMinmax;
-
-        snprintf(symboln, sizeof(symboln), "%sResetMinmaxEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexImage3D) {
-        void **procp = (void **) &disp->TexImage3D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexImage3D", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexImage3D) {
-        void **procp = (void **) &disp->TexImage3D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexImage3DEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexSubImage3D) {
-        void **procp = (void **) &disp->TexSubImage3D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexSubImage3D", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexSubImage3D) {
-        void **procp = (void **) &disp->TexSubImage3D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexSubImage3DEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyTexSubImage3D) {
-        void **procp = (void **) &disp->CopyTexSubImage3D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage3D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyTexSubImage3D) {
-        void **procp = (void **) &disp->CopyTexSubImage3D;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage3DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ActiveTextureARB) {
-        void **procp = (void **) &disp->ActiveTextureARB;
-
-        snprintf(symboln, sizeof(symboln), "%sActiveTexture", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ActiveTextureARB) {
-        void **procp = (void **) &disp->ActiveTextureARB;
-
-        snprintf(symboln, sizeof(symboln), "%sActiveTextureARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClientActiveTextureARB) {
-        void **procp = (void **) &disp->ClientActiveTextureARB;
-
-        snprintf(symboln, sizeof(symboln), "%sClientActiveTexture",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClientActiveTextureARB) {
-        void **procp = (void **) &disp->ClientActiveTextureARB;
-
-        snprintf(symboln, sizeof(symboln), "%sClientActiveTextureARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1dARB) {
-        void **procp = (void **) &disp->MultiTexCoord1dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1dARB) {
-        void **procp = (void **) &disp->MultiTexCoord1dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1dARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord1dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord1dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1dvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1fARB) {
-        void **procp = (void **) &disp->MultiTexCoord1fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1fARB) {
-        void **procp = (void **) &disp->MultiTexCoord1fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1fARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord1fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord1fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1iARB) {
-        void **procp = (void **) &disp->MultiTexCoord1iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1iARB) {
-        void **procp = (void **) &disp->MultiTexCoord1iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1iARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord1ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord1ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1ivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1sARB) {
-        void **procp = (void **) &disp->MultiTexCoord1sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1sARB) {
-        void **procp = (void **) &disp->MultiTexCoord1sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1sARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1svARB) {
-        void **procp = (void **) &disp->MultiTexCoord1svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord1svARB) {
-        void **procp = (void **) &disp->MultiTexCoord1svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1svARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2dARB) {
-        void **procp = (void **) &disp->MultiTexCoord2dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2dARB) {
-        void **procp = (void **) &disp->MultiTexCoord2dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2dARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord2dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord2dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2dvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2fARB) {
-        void **procp = (void **) &disp->MultiTexCoord2fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2fARB) {
-        void **procp = (void **) &disp->MultiTexCoord2fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2fARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord2fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord2fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2iARB) {
-        void **procp = (void **) &disp->MultiTexCoord2iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2iARB) {
-        void **procp = (void **) &disp->MultiTexCoord2iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2iARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord2ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord2ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2ivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2sARB) {
-        void **procp = (void **) &disp->MultiTexCoord2sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2sARB) {
-        void **procp = (void **) &disp->MultiTexCoord2sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2sARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2svARB) {
-        void **procp = (void **) &disp->MultiTexCoord2svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord2svARB) {
-        void **procp = (void **) &disp->MultiTexCoord2svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2svARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3dARB) {
-        void **procp = (void **) &disp->MultiTexCoord3dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3dARB) {
-        void **procp = (void **) &disp->MultiTexCoord3dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3dARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord3dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord3dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3dvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3fARB) {
-        void **procp = (void **) &disp->MultiTexCoord3fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3fARB) {
-        void **procp = (void **) &disp->MultiTexCoord3fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3fARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord3fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord3fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3iARB) {
-        void **procp = (void **) &disp->MultiTexCoord3iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3iARB) {
-        void **procp = (void **) &disp->MultiTexCoord3iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3iARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord3ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord3ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3ivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3sARB) {
-        void **procp = (void **) &disp->MultiTexCoord3sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3sARB) {
-        void **procp = (void **) &disp->MultiTexCoord3sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3sARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3svARB) {
-        void **procp = (void **) &disp->MultiTexCoord3svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord3svARB) {
-        void **procp = (void **) &disp->MultiTexCoord3svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3svARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4dARB) {
-        void **procp = (void **) &disp->MultiTexCoord4dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4dARB) {
-        void **procp = (void **) &disp->MultiTexCoord4dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4dARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord4dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord4dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4dvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4fARB) {
-        void **procp = (void **) &disp->MultiTexCoord4fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4fARB) {
-        void **procp = (void **) &disp->MultiTexCoord4fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4fARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord4fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord4fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4iARB) {
-        void **procp = (void **) &disp->MultiTexCoord4iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4iARB) {
-        void **procp = (void **) &disp->MultiTexCoord4iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4iARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord4ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord4ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4ivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4sARB) {
-        void **procp = (void **) &disp->MultiTexCoord4sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4sARB) {
-        void **procp = (void **) &disp->MultiTexCoord4sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4sARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4svARB) {
-        void **procp = (void **) &disp->MultiTexCoord4svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoord4svARB) {
-        void **procp = (void **) &disp->MultiTexCoord4svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4svARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->AttachShader) {
-        void **procp = (void **) &disp->AttachShader;
-
-        snprintf(symboln, sizeof(symboln), "%sAttachShader", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CreateProgram) {
-        void **procp = (void **) &disp->CreateProgram;
-
-        snprintf(symboln, sizeof(symboln), "%sCreateProgram", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CreateShader) {
-        void **procp = (void **) &disp->CreateShader;
-
-        snprintf(symboln, sizeof(symboln), "%sCreateShader", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteProgram) {
-        void **procp = (void **) &disp->DeleteProgram;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteProgram", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteShader) {
-        void **procp = (void **) &disp->DeleteShader;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteShader", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DetachShader) {
-        void **procp = (void **) &disp->DetachShader;
-
-        snprintf(symboln, sizeof(symboln), "%sDetachShader", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetAttachedShaders) {
-        void **procp = (void **) &disp->GetAttachedShaders;
-
-        snprintf(symboln, sizeof(symboln), "%sGetAttachedShaders",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramInfoLog) {
-        void **procp = (void **) &disp->GetProgramInfoLog;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramInfoLog",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramiv) {
-        void **procp = (void **) &disp->GetProgramiv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetShaderInfoLog) {
-        void **procp = (void **) &disp->GetShaderInfoLog;
-
-        snprintf(symboln, sizeof(symboln), "%sGetShaderInfoLog", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetShaderiv) {
-        void **procp = (void **) &disp->GetShaderiv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetShaderiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsProgram) {
-        void **procp = (void **) &disp->IsProgram;
-
-        snprintf(symboln, sizeof(symboln), "%sIsProgram", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsShader) {
-        void **procp = (void **) &disp->IsShader;
-
-        snprintf(symboln, sizeof(symboln), "%sIsShader", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->StencilFuncSeparate) {
-        void **procp = (void **) &disp->StencilFuncSeparate;
-
-        snprintf(symboln, sizeof(symboln), "%sStencilFuncSeparate",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->StencilMaskSeparate) {
-        void **procp = (void **) &disp->StencilMaskSeparate;
-
-        snprintf(symboln, sizeof(symboln), "%sStencilMaskSeparate",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->StencilOpSeparate) {
-        void **procp = (void **) &disp->StencilOpSeparate;
-
-        snprintf(symboln, sizeof(symboln), "%sStencilOpSeparate",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->StencilOpSeparate) {
-        void **procp = (void **) &disp->StencilOpSeparate;
-
-        snprintf(symboln, sizeof(symboln), "%sStencilOpSeparateATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UniformMatrix2x3fv) {
-        void **procp = (void **) &disp->UniformMatrix2x3fv;
-
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix2x3fv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UniformMatrix2x4fv) {
-        void **procp = (void **) &disp->UniformMatrix2x4fv;
-
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix2x4fv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UniformMatrix3x2fv) {
-        void **procp = (void **) &disp->UniformMatrix3x2fv;
-
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix3x2fv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UniformMatrix3x4fv) {
-        void **procp = (void **) &disp->UniformMatrix3x4fv;
-
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix3x4fv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UniformMatrix4x2fv) {
-        void **procp = (void **) &disp->UniformMatrix4x2fv;
-
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix4x2fv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UniformMatrix4x3fv) {
-        void **procp = (void **) &disp->UniformMatrix4x3fv;
-
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix4x3fv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    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);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClearBufferfv) {
-        void **procp = (void **) &disp->ClearBufferfv;
-
-        snprintf(symboln, sizeof(symboln), "%sClearBufferfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClearBufferiv) {
-        void **procp = (void **) &disp->ClearBufferiv;
-
-        snprintf(symboln, sizeof(symboln), "%sClearBufferiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClearBufferuiv) {
-        void **procp = (void **) &disp->ClearBufferuiv;
-
-        snprintf(symboln, sizeof(symboln), "%sClearBufferuiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetStringi) {
-        void **procp = (void **) &disp->GetStringi;
-
-        snprintf(symboln, sizeof(symboln), "%sGetStringi", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexBuffer) {
-        void **procp = (void **) &disp->TexBuffer;
-
-        snprintf(symboln, sizeof(symboln), "%sTexBuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FramebufferTexture) {
-        void **procp = (void **) &disp->FramebufferTexture;
-
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetBufferParameteri64v) {
-        void **procp = (void **) &disp->GetBufferParameteri64v;
-
-        snprintf(symboln, sizeof(symboln), "%sGetBufferParameteri64v",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetInteger64i_v) {
-        void **procp = (void **) &disp->GetInteger64i_v;
-
-        snprintf(symboln, sizeof(symboln), "%sGetInteger64i_v", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    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);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LoadTransposeMatrixdARB) {
-        void **procp = (void **) &disp->LoadTransposeMatrixdARB;
-
-        snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixdARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LoadTransposeMatrixfARB) {
-        void **procp = (void **) &disp->LoadTransposeMatrixfARB;
-
-        snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixf",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LoadTransposeMatrixfARB) {
-        void **procp = (void **) &disp->LoadTransposeMatrixfARB;
-
-        snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixfARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultTransposeMatrixdARB) {
-        void **procp = (void **) &disp->MultTransposeMatrixdARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultTransposeMatrixd",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultTransposeMatrixdARB) {
-        void **procp = (void **) &disp->MultTransposeMatrixdARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultTransposeMatrixdARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultTransposeMatrixfARB) {
-        void **procp = (void **) &disp->MultTransposeMatrixfARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultTransposeMatrixf",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultTransposeMatrixfARB) {
-        void **procp = (void **) &disp->MultTransposeMatrixfARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMultTransposeMatrixfARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SampleCoverageARB) {
-        void **procp = (void **) &disp->SampleCoverageARB;
-
-        snprintf(symboln, sizeof(symboln), "%sSampleCoverage", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SampleCoverageARB) {
-        void **procp = (void **) &disp->SampleCoverageARB;
-
-        snprintf(symboln, sizeof(symboln), "%sSampleCoverageARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompressedTexImage1DARB) {
-        void **procp = (void **) &disp->CompressedTexImage1DARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage1D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompressedTexImage1DARB) {
-        void **procp = (void **) &disp->CompressedTexImage1DARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage1DARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompressedTexImage2DARB) {
-        void **procp = (void **) &disp->CompressedTexImage2DARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage2D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompressedTexImage2DARB) {
-        void **procp = (void **) &disp->CompressedTexImage2DARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage2DARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompressedTexImage3DARB) {
-        void **procp = (void **) &disp->CompressedTexImage3DARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage3D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompressedTexImage3DARB) {
-        void **procp = (void **) &disp->CompressedTexImage3DARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage3DARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompressedTexSubImage1DARB) {
-        void **procp = (void **) &disp->CompressedTexSubImage1DARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage1D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompressedTexSubImage1DARB) {
-        void **procp = (void **) &disp->CompressedTexSubImage1DARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage1DARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompressedTexSubImage2DARB) {
-        void **procp = (void **) &disp->CompressedTexSubImage2DARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage2D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompressedTexSubImage2DARB) {
-        void **procp = (void **) &disp->CompressedTexSubImage2DARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage2DARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompressedTexSubImage3DARB) {
-        void **procp = (void **) &disp->CompressedTexSubImage3DARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage3D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompressedTexSubImage3DARB) {
-        void **procp = (void **) &disp->CompressedTexSubImage3DARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage3DARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetCompressedTexImageARB) {
-        void **procp = (void **) &disp->GetCompressedTexImageARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetCompressedTexImage",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetCompressedTexImageARB) {
-        void **procp = (void **) &disp->GetCompressedTexImageARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetCompressedTexImageARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DisableVertexAttribArrayARB) {
-        void **procp = (void **) &disp->DisableVertexAttribArrayARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDisableVertexAttribArray",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DisableVertexAttribArrayARB) {
-        void **procp = (void **) &disp->DisableVertexAttribArrayARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDisableVertexAttribArrayARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EnableVertexAttribArrayARB) {
-        void **procp = (void **) &disp->EnableVertexAttribArrayARB;
-
-        snprintf(symboln, sizeof(symboln), "%sEnableVertexAttribArray",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EnableVertexAttribArrayARB) {
-        void **procp = (void **) &disp->EnableVertexAttribArrayARB;
-
-        snprintf(symboln, sizeof(symboln), "%sEnableVertexAttribArrayARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramEnvParameterdvARB) {
-        void **procp = (void **) &disp->GetProgramEnvParameterdvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramEnvParameterdvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramEnvParameterfvARB) {
-        void **procp = (void **) &disp->GetProgramEnvParameterfvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramEnvParameterfvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramLocalParameterdvARB) {
-        void **procp = (void **) &disp->GetProgramLocalParameterdvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramLocalParameterdvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramLocalParameterfvARB) {
-        void **procp = (void **) &disp->GetProgramLocalParameterfvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramLocalParameterfvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramStringARB) {
-        void **procp = (void **) &disp->GetProgramStringARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramStringARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramivARB) {
-        void **procp = (void **) &disp->GetProgramivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramivARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribdvARB) {
-        void **procp = (void **) &disp->GetVertexAttribdvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribdv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribdvARB) {
-        void **procp = (void **) &disp->GetVertexAttribdvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribdvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribfvARB) {
-        void **procp = (void **) &disp->GetVertexAttribfvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribfv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribfvARB) {
-        void **procp = (void **) &disp->GetVertexAttribfvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribfvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribivARB) {
-        void **procp = (void **) &disp->GetVertexAttribivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribivARB) {
-        void **procp = (void **) &disp->GetVertexAttribivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramEnvParameter4dARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameter4dARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramEnvParameter4dARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramParameter4dNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramEnvParameter4dvARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameter4dvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramEnvParameter4dvARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramParameter4dvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramEnvParameter4fARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameter4fARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramEnvParameter4fARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramParameter4fNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramEnvParameter4fvARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameter4fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramEnvParameter4fvARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramParameter4fvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramLocalParameter4dARB) {
-        void **procp = (void **) &disp->ProgramLocalParameter4dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameter4dARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramLocalParameter4dvARB) {
-        void **procp = (void **) &disp->ProgramLocalParameter4dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameter4dvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramLocalParameter4fARB) {
-        void **procp = (void **) &disp->ProgramLocalParameter4fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameter4fARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramLocalParameter4fvARB) {
-        void **procp = (void **) &disp->ProgramLocalParameter4fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameter4fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramStringARB) {
-        void **procp = (void **) &disp->ProgramStringARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramStringARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1dARB) {
-        void **procp = (void **) &disp->VertexAttrib1dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1dARB) {
-        void **procp = (void **) &disp->VertexAttrib1dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1dvARB) {
-        void **procp = (void **) &disp->VertexAttrib1dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1dvARB) {
-        void **procp = (void **) &disp->VertexAttrib1dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1fARB) {
-        void **procp = (void **) &disp->VertexAttrib1fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1fARB) {
-        void **procp = (void **) &disp->VertexAttrib1fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1fvARB) {
-        void **procp = (void **) &disp->VertexAttrib1fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1fvARB) {
-        void **procp = (void **) &disp->VertexAttrib1fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1sARB) {
-        void **procp = (void **) &disp->VertexAttrib1sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1sARB) {
-        void **procp = (void **) &disp->VertexAttrib1sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1sARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1svARB) {
-        void **procp = (void **) &disp->VertexAttrib1svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1svARB) {
-        void **procp = (void **) &disp->VertexAttrib1svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1svARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2dARB) {
-        void **procp = (void **) &disp->VertexAttrib2dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2dARB) {
-        void **procp = (void **) &disp->VertexAttrib2dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2dvARB) {
-        void **procp = (void **) &disp->VertexAttrib2dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2dvARB) {
-        void **procp = (void **) &disp->VertexAttrib2dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2fARB) {
-        void **procp = (void **) &disp->VertexAttrib2fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2fARB) {
-        void **procp = (void **) &disp->VertexAttrib2fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2fvARB) {
-        void **procp = (void **) &disp->VertexAttrib2fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2fvARB) {
-        void **procp = (void **) &disp->VertexAttrib2fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2sARB) {
-        void **procp = (void **) &disp->VertexAttrib2sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2sARB) {
-        void **procp = (void **) &disp->VertexAttrib2sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2sARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2svARB) {
-        void **procp = (void **) &disp->VertexAttrib2svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2svARB) {
-        void **procp = (void **) &disp->VertexAttrib2svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2svARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3dARB) {
-        void **procp = (void **) &disp->VertexAttrib3dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3dARB) {
-        void **procp = (void **) &disp->VertexAttrib3dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3dvARB) {
-        void **procp = (void **) &disp->VertexAttrib3dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3dvARB) {
-        void **procp = (void **) &disp->VertexAttrib3dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3fARB) {
-        void **procp = (void **) &disp->VertexAttrib3fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3fARB) {
-        void **procp = (void **) &disp->VertexAttrib3fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3fvARB) {
-        void **procp = (void **) &disp->VertexAttrib3fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3fvARB) {
-        void **procp = (void **) &disp->VertexAttrib3fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3sARB) {
-        void **procp = (void **) &disp->VertexAttrib3sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3sARB) {
-        void **procp = (void **) &disp->VertexAttrib3sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3sARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3svARB) {
-        void **procp = (void **) &disp->VertexAttrib3svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3svARB) {
-        void **procp = (void **) &disp->VertexAttrib3svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3svARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NbvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NbvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nbv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NbvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NbvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NbvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NivARB) {
-        void **procp = (void **) &disp->VertexAttrib4NivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Niv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NivARB) {
-        void **procp = (void **) &disp->VertexAttrib4NivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NsvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NsvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nsv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NsvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NsvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NsvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NubARB) {
-        void **procp = (void **) &disp->VertexAttrib4NubARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nub", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NubARB) {
-        void **procp = (void **) &disp->VertexAttrib4NubARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NubARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NubvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NubvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nubv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NubvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NubvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NubvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NuivARB) {
-        void **procp = (void **) &disp->VertexAttrib4NuivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nuiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NuivARB) {
-        void **procp = (void **) &disp->VertexAttrib4NuivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NuivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NusvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NusvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nusv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4NusvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NusvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NusvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4bvARB) {
-        void **procp = (void **) &disp->VertexAttrib4bvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4bv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4bvARB) {
-        void **procp = (void **) &disp->VertexAttrib4bvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4bvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4dARB) {
-        void **procp = (void **) &disp->VertexAttrib4dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4dARB) {
-        void **procp = (void **) &disp->VertexAttrib4dARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4dvARB) {
-        void **procp = (void **) &disp->VertexAttrib4dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4dvARB) {
-        void **procp = (void **) &disp->VertexAttrib4dvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4fARB) {
-        void **procp = (void **) &disp->VertexAttrib4fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4fARB) {
-        void **procp = (void **) &disp->VertexAttrib4fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4fvARB) {
-        void **procp = (void **) &disp->VertexAttrib4fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4fvARB) {
-        void **procp = (void **) &disp->VertexAttrib4fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4ivARB) {
-        void **procp = (void **) &disp->VertexAttrib4ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4ivARB) {
-        void **procp = (void **) &disp->VertexAttrib4ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4sARB) {
-        void **procp = (void **) &disp->VertexAttrib4sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4sARB) {
-        void **procp = (void **) &disp->VertexAttrib4sARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4sARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4svARB) {
-        void **procp = (void **) &disp->VertexAttrib4svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4svARB) {
-        void **procp = (void **) &disp->VertexAttrib4svARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4svARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4ubvARB) {
-        void **procp = (void **) &disp->VertexAttrib4ubvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ubv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4ubvARB) {
-        void **procp = (void **) &disp->VertexAttrib4ubvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ubvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4uivARB) {
-        void **procp = (void **) &disp->VertexAttrib4uivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4uivARB) {
-        void **procp = (void **) &disp->VertexAttrib4uivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4uivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4usvARB) {
-        void **procp = (void **) &disp->VertexAttrib4usvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4usv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4usvARB) {
-        void **procp = (void **) &disp->VertexAttrib4usvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4usvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribPointerARB) {
-        void **procp = (void **) &disp->VertexAttribPointerARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribPointer",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribPointerARB) {
-        void **procp = (void **) &disp->VertexAttribPointerARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribPointerARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindBufferARB) {
-        void **procp = (void **) &disp->BindBufferARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBindBuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindBufferARB) {
-        void **procp = (void **) &disp->BindBufferARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBindBufferARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BufferDataARB) {
-        void **procp = (void **) &disp->BufferDataARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBufferData", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BufferDataARB) {
-        void **procp = (void **) &disp->BufferDataARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBufferDataARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BufferSubDataARB) {
-        void **procp = (void **) &disp->BufferSubDataARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBufferSubData", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BufferSubDataARB) {
-        void **procp = (void **) &disp->BufferSubDataARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBufferSubDataARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteBuffersARB) {
-        void **procp = (void **) &disp->DeleteBuffersARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteBuffers", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteBuffersARB) {
-        void **procp = (void **) &disp->DeleteBuffersARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteBuffersARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenBuffersARB) {
-        void **procp = (void **) &disp->GenBuffersARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGenBuffers", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenBuffersARB) {
-        void **procp = (void **) &disp->GenBuffersARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGenBuffersARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetBufferParameterivARB) {
-        void **procp = (void **) &disp->GetBufferParameterivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetBufferParameteriv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetBufferParameterivARB) {
-        void **procp = (void **) &disp->GetBufferParameterivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetBufferParameterivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetBufferPointervARB) {
-        void **procp = (void **) &disp->GetBufferPointervARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetBufferPointerv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetBufferPointervARB) {
-        void **procp = (void **) &disp->GetBufferPointervARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetBufferPointervARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetBufferSubDataARB) {
-        void **procp = (void **) &disp->GetBufferSubDataARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetBufferSubData", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetBufferSubDataARB) {
-        void **procp = (void **) &disp->GetBufferSubDataARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetBufferSubDataARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsBufferARB) {
-        void **procp = (void **) &disp->IsBufferARB;
-
-        snprintf(symboln, sizeof(symboln), "%sIsBuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsBufferARB) {
-        void **procp = (void **) &disp->IsBufferARB;
-
-        snprintf(symboln, sizeof(symboln), "%sIsBufferARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MapBufferARB) {
-        void **procp = (void **) &disp->MapBufferARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMapBuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MapBufferARB) {
-        void **procp = (void **) &disp->MapBufferARB;
-
-        snprintf(symboln, sizeof(symboln), "%sMapBufferARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UnmapBufferARB) {
-        void **procp = (void **) &disp->UnmapBufferARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUnmapBuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UnmapBufferARB) {
-        void **procp = (void **) &disp->UnmapBufferARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUnmapBufferARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BeginQueryARB) {
-        void **procp = (void **) &disp->BeginQueryARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBeginQuery", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BeginQueryARB) {
-        void **procp = (void **) &disp->BeginQueryARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBeginQueryARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteQueriesARB) {
-        void **procp = (void **) &disp->DeleteQueriesARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteQueries", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteQueriesARB) {
-        void **procp = (void **) &disp->DeleteQueriesARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteQueriesARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EndQueryARB) {
-        void **procp = (void **) &disp->EndQueryARB;
-
-        snprintf(symboln, sizeof(symboln), "%sEndQuery", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EndQueryARB) {
-        void **procp = (void **) &disp->EndQueryARB;
-
-        snprintf(symboln, sizeof(symboln), "%sEndQueryARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenQueriesARB) {
-        void **procp = (void **) &disp->GenQueriesARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGenQueries", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenQueriesARB) {
-        void **procp = (void **) &disp->GenQueriesARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGenQueriesARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetQueryObjectivARB) {
-        void **procp = (void **) &disp->GetQueryObjectivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetQueryObjectivARB) {
-        void **procp = (void **) &disp->GetQueryObjectivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetQueryObjectuivARB) {
-        void **procp = (void **) &disp->GetQueryObjectuivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectuiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetQueryObjectuivARB) {
-        void **procp = (void **) &disp->GetQueryObjectuivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectuivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetQueryivARB) {
-        void **procp = (void **) &disp->GetQueryivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetQueryiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetQueryivARB) {
-        void **procp = (void **) &disp->GetQueryivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetQueryivARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsQueryARB) {
-        void **procp = (void **) &disp->IsQueryARB;
-
-        snprintf(symboln, sizeof(symboln), "%sIsQuery", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsQueryARB) {
-        void **procp = (void **) &disp->IsQueryARB;
-
-        snprintf(symboln, sizeof(symboln), "%sIsQueryARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->AttachObjectARB) {
-        void **procp = (void **) &disp->AttachObjectARB;
-
-        snprintf(symboln, sizeof(symboln), "%sAttachObjectARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompileShaderARB) {
-        void **procp = (void **) &disp->CompileShaderARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompileShader", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CompileShaderARB) {
-        void **procp = (void **) &disp->CompileShaderARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCompileShaderARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CreateProgramObjectARB) {
-        void **procp = (void **) &disp->CreateProgramObjectARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCreateProgramObjectARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CreateShaderObjectARB) {
-        void **procp = (void **) &disp->CreateShaderObjectARB;
-
-        snprintf(symboln, sizeof(symboln), "%sCreateShaderObjectARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteObjectARB) {
-        void **procp = (void **) &disp->DeleteObjectARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteObjectARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DetachObjectARB) {
-        void **procp = (void **) &disp->DetachObjectARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDetachObjectARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetActiveUniformARB) {
-        void **procp = (void **) &disp->GetActiveUniformARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetActiveUniform", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetActiveUniformARB) {
-        void **procp = (void **) &disp->GetActiveUniformARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetActiveUniformARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetAttachedObjectsARB) {
-        void **procp = (void **) &disp->GetAttachedObjectsARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetAttachedObjectsARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetHandleARB) {
-        void **procp = (void **) &disp->GetHandleARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetHandleARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetInfoLogARB) {
-        void **procp = (void **) &disp->GetInfoLogARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetInfoLogARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetObjectParameterfvARB) {
-        void **procp = (void **) &disp->GetObjectParameterfvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetObjectParameterfvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetObjectParameterivARB) {
-        void **procp = (void **) &disp->GetObjectParameterivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetObjectParameterivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetShaderSourceARB) {
-        void **procp = (void **) &disp->GetShaderSourceARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetShaderSource", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetShaderSourceARB) {
-        void **procp = (void **) &disp->GetShaderSourceARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetShaderSourceARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetUniformLocationARB) {
-        void **procp = (void **) &disp->GetUniformLocationARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetUniformLocation",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetUniformLocationARB) {
-        void **procp = (void **) &disp->GetUniformLocationARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetUniformLocationARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetUniformfvARB) {
-        void **procp = (void **) &disp->GetUniformfvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetUniformfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetUniformfvARB) {
-        void **procp = (void **) &disp->GetUniformfvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetUniformfvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetUniformivARB) {
-        void **procp = (void **) &disp->GetUniformivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetUniformiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetUniformivARB) {
-        void **procp = (void **) &disp->GetUniformivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetUniformivARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LinkProgramARB) {
-        void **procp = (void **) &disp->LinkProgramARB;
-
-        snprintf(symboln, sizeof(symboln), "%sLinkProgram", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LinkProgramARB) {
-        void **procp = (void **) &disp->LinkProgramARB;
-
-        snprintf(symboln, sizeof(symboln), "%sLinkProgramARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ShaderSourceARB) {
-        void **procp = (void **) &disp->ShaderSourceARB;
-
-        snprintf(symboln, sizeof(symboln), "%sShaderSource", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ShaderSourceARB) {
-        void **procp = (void **) &disp->ShaderSourceARB;
-
-        snprintf(symboln, sizeof(symboln), "%sShaderSourceARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform1fARB) {
-        void **procp = (void **) &disp->Uniform1fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform1f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform1fARB) {
-        void **procp = (void **) &disp->Uniform1fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform1fARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform1fvARB) {
-        void **procp = (void **) &disp->Uniform1fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform1fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform1fvARB) {
-        void **procp = (void **) &disp->Uniform1fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform1fvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform1iARB) {
-        void **procp = (void **) &disp->Uniform1iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform1i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform1iARB) {
-        void **procp = (void **) &disp->Uniform1iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform1iARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform1ivARB) {
-        void **procp = (void **) &disp->Uniform1ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform1iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform1ivARB) {
-        void **procp = (void **) &disp->Uniform1ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform1ivARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform2fARB) {
-        void **procp = (void **) &disp->Uniform2fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform2f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform2fARB) {
-        void **procp = (void **) &disp->Uniform2fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform2fARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform2fvARB) {
-        void **procp = (void **) &disp->Uniform2fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform2fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform2fvARB) {
-        void **procp = (void **) &disp->Uniform2fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform2fvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform2iARB) {
-        void **procp = (void **) &disp->Uniform2iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform2i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform2iARB) {
-        void **procp = (void **) &disp->Uniform2iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform2iARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform2ivARB) {
-        void **procp = (void **) &disp->Uniform2ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform2iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform2ivARB) {
-        void **procp = (void **) &disp->Uniform2ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform2ivARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform3fARB) {
-        void **procp = (void **) &disp->Uniform3fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform3f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform3fARB) {
-        void **procp = (void **) &disp->Uniform3fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform3fARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform3fvARB) {
-        void **procp = (void **) &disp->Uniform3fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform3fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform3fvARB) {
-        void **procp = (void **) &disp->Uniform3fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform3fvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform3iARB) {
-        void **procp = (void **) &disp->Uniform3iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform3i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform3iARB) {
-        void **procp = (void **) &disp->Uniform3iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform3iARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform3ivARB) {
-        void **procp = (void **) &disp->Uniform3ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform3iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform3ivARB) {
-        void **procp = (void **) &disp->Uniform3ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform3ivARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform4fARB) {
-        void **procp = (void **) &disp->Uniform4fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform4f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform4fARB) {
-        void **procp = (void **) &disp->Uniform4fARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform4fARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform4fvARB) {
-        void **procp = (void **) &disp->Uniform4fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform4fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform4fvARB) {
-        void **procp = (void **) &disp->Uniform4fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform4fvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform4iARB) {
-        void **procp = (void **) &disp->Uniform4iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform4i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform4iARB) {
-        void **procp = (void **) &disp->Uniform4iARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform4iARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform4ivARB) {
-        void **procp = (void **) &disp->Uniform4ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform4iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform4ivARB) {
-        void **procp = (void **) &disp->Uniform4ivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform4ivARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UniformMatrix2fvARB) {
-        void **procp = (void **) &disp->UniformMatrix2fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix2fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UniformMatrix2fvARB) {
-        void **procp = (void **) &disp->UniformMatrix2fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix2fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UniformMatrix3fvARB) {
-        void **procp = (void **) &disp->UniformMatrix3fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix3fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UniformMatrix3fvARB) {
-        void **procp = (void **) &disp->UniformMatrix3fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix3fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UniformMatrix4fvARB) {
-        void **procp = (void **) &disp->UniformMatrix4fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix4fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UniformMatrix4fvARB) {
-        void **procp = (void **) &disp->UniformMatrix4fvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix4fvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UseProgramObjectARB) {
-        void **procp = (void **) &disp->UseProgramObjectARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUseProgram", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UseProgramObjectARB) {
-        void **procp = (void **) &disp->UseProgramObjectARB;
-
-        snprintf(symboln, sizeof(symboln), "%sUseProgramObjectARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ValidateProgramARB) {
-        void **procp = (void **) &disp->ValidateProgramARB;
-
-        snprintf(symboln, sizeof(symboln), "%sValidateProgram", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ValidateProgramARB) {
-        void **procp = (void **) &disp->ValidateProgramARB;
-
-        snprintf(symboln, sizeof(symboln), "%sValidateProgramARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindAttribLocationARB) {
-        void **procp = (void **) &disp->BindAttribLocationARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBindAttribLocation",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindAttribLocationARB) {
-        void **procp = (void **) &disp->BindAttribLocationARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBindAttribLocationARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetActiveAttribARB) {
-        void **procp = (void **) &disp->GetActiveAttribARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetActiveAttrib", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetActiveAttribARB) {
-        void **procp = (void **) &disp->GetActiveAttribARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetActiveAttribARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetAttribLocationARB) {
-        void **procp = (void **) &disp->GetAttribLocationARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetAttribLocation",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetAttribLocationARB) {
-        void **procp = (void **) &disp->GetAttribLocationARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetAttribLocationARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawBuffersARB) {
-        void **procp = (void **) &disp->DrawBuffersARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawBuffers", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawBuffersARB) {
-        void **procp = (void **) &disp->DrawBuffersARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawBuffersARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawBuffersARB) {
-        void **procp = (void **) &disp->DrawBuffersARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawBuffersATI", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawBuffersARB) {
-        void **procp = (void **) &disp->DrawBuffersARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawBuffersNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClampColorARB) {
-        void **procp = (void **) &disp->ClampColorARB;
-
-        snprintf(symboln, sizeof(symboln), "%sClampColorARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawArraysInstancedARB) {
-        void **procp = (void **) &disp->DrawArraysInstancedARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawArraysInstancedARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawArraysInstancedARB) {
-        void **procp = (void **) &disp->DrawArraysInstancedARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawArraysInstancedEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawArraysInstancedARB) {
-        void **procp = (void **) &disp->DrawArraysInstancedARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawArraysInstanced",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawElementsInstancedARB) {
-        void **procp = (void **) &disp->DrawElementsInstancedARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstancedARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawElementsInstancedARB) {
-        void **procp = (void **) &disp->DrawElementsInstancedARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstancedEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawElementsInstancedARB) {
-        void **procp = (void **) &disp->DrawElementsInstancedARB;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstanced",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RenderbufferStorageMultisample) {
-        void **procp = (void **) &disp->RenderbufferStorageMultisample;
-
-        snprintf(symboln, sizeof(symboln), "%sRenderbufferStorageMultisample",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RenderbufferStorageMultisample) {
-        void **procp = (void **) &disp->RenderbufferStorageMultisample;
-
-        snprintf(symboln, sizeof(symboln),
-                 "%sRenderbufferStorageMultisampleEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    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);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramParameteriARB) {
-        void **procp = (void **) &disp->ProgramParameteriARB;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramParameteriARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribDivisorARB) {
-        void **procp = (void **) &disp->VertexAttribDivisorARB;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisorARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FlushMappedBufferRange) {
-        void **procp = (void **) &disp->FlushMappedBufferRange;
-
-        snprintf(symboln, sizeof(symboln), "%sFlushMappedBufferRange",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MapBufferRange) {
-        void **procp = (void **) &disp->MapBufferRange;
-
-        snprintf(symboln, sizeof(symboln), "%sMapBufferRange", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexBufferARB) {
-        void **procp = (void **) &disp->TexBufferARB;
-
-        snprintf(symboln, sizeof(symboln), "%sTexBufferARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindVertexArray) {
-        void **procp = (void **) &disp->BindVertexArray;
-
-        snprintf(symboln, sizeof(symboln), "%sBindVertexArray", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenVertexArrays) {
-        void **procp = (void **) &disp->GenVertexArrays;
-
-        snprintf(symboln, sizeof(symboln), "%sGenVertexArrays", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CopyBufferSubData) {
-        void **procp = (void **) &disp->CopyBufferSubData;
-
-        snprintf(symboln, sizeof(symboln), "%sCopyBufferSubData",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClientWaitSync) {
-        void **procp = (void **) &disp->ClientWaitSync;
-
-        snprintf(symboln, sizeof(symboln), "%sClientWaitSync", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteSync) {
-        void **procp = (void **) &disp->DeleteSync;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteSync", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FenceSync) {
-        void **procp = (void **) &disp->FenceSync;
-
-        snprintf(symboln, sizeof(symboln), "%sFenceSync", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetInteger64v) {
-        void **procp = (void **) &disp->GetInteger64v;
-
-        snprintf(symboln, sizeof(symboln), "%sGetInteger64v", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetSynciv) {
-        void **procp = (void **) &disp->GetSynciv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetSynciv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsSync) {
-        void **procp = (void **) &disp->IsSync;
-
-        snprintf(symboln, sizeof(symboln), "%sIsSync", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WaitSync) {
-        void **procp = (void **) &disp->WaitSync;
-
-        snprintf(symboln, sizeof(symboln), "%sWaitSync", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawElementsBaseVertex) {
-        void **procp = (void **) &disp->DrawElementsBaseVertex;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawElementsBaseVertex",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawElementsInstancedBaseVertex) {
-        void **procp = (void **) &disp->DrawElementsInstancedBaseVertex;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstancedBaseVertex",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawRangeElementsBaseVertex) {
-        void **procp = (void **) &disp->DrawRangeElementsBaseVertex;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawRangeElementsBaseVertex",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiDrawElementsBaseVertex) {
-        void **procp = (void **) &disp->MultiDrawElementsBaseVertex;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiDrawElementsBaseVertex",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendEquationSeparateiARB) {
-        void **procp = (void **) &disp->BlendEquationSeparateiARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateiARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendEquationSeparateiARB) {
-        void **procp = (void **) &disp->BlendEquationSeparateiARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateIndexedAMD",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendEquationiARB) {
-        void **procp = (void **) &disp->BlendEquationiARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationiARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendEquationiARB) {
-        void **procp = (void **) &disp->BlendEquationiARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationIndexedAMD",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendFuncSeparateiARB) {
-        void **procp = (void **) &disp->BlendFuncSeparateiARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateiARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendFuncSeparateiARB) {
-        void **procp = (void **) &disp->BlendFuncSeparateiARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateIndexedAMD",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendFunciARB) {
-        void **procp = (void **) &disp->BlendFunciARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendFunciARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendFunciARB) {
-        void **procp = (void **) &disp->BlendFunciARB;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendFuncIndexedAMD",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindSampler) {
-        void **procp = (void **) &disp->BindSampler;
-
-        snprintf(symboln, sizeof(symboln), "%sBindSampler", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteSamplers) {
-        void **procp = (void **) &disp->DeleteSamplers;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteSamplers", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenSamplers) {
-        void **procp = (void **) &disp->GenSamplers;
-
-        snprintf(symboln, sizeof(symboln), "%sGenSamplers", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetSamplerParameterIiv) {
-        void **procp = (void **) &disp->GetSamplerParameterIiv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetSamplerParameterIiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetSamplerParameterIuiv) {
-        void **procp = (void **) &disp->GetSamplerParameterIuiv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetSamplerParameterIuiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetSamplerParameterfv) {
-        void **procp = (void **) &disp->GetSamplerParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetSamplerParameterfv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetSamplerParameteriv) {
-        void **procp = (void **) &disp->GetSamplerParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sGetSamplerParameteriv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsSampler) {
-        void **procp = (void **) &disp->IsSampler;
-
-        snprintf(symboln, sizeof(symboln), "%sIsSampler", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SamplerParameterIiv) {
-        void **procp = (void **) &disp->SamplerParameterIiv;
-
-        snprintf(symboln, sizeof(symboln), "%sSamplerParameterIiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SamplerParameterIuiv) {
-        void **procp = (void **) &disp->SamplerParameterIuiv;
-
-        snprintf(symboln, sizeof(symboln), "%sSamplerParameterIuiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SamplerParameterf) {
-        void **procp = (void **) &disp->SamplerParameterf;
-
-        snprintf(symboln, sizeof(symboln), "%sSamplerParameterf",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SamplerParameterfv) {
-        void **procp = (void **) &disp->SamplerParameterfv;
-
-        snprintf(symboln, sizeof(symboln), "%sSamplerParameterfv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SamplerParameteri) {
-        void **procp = (void **) &disp->SamplerParameteri;
-
-        snprintf(symboln, sizeof(symboln), "%sSamplerParameteri",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SamplerParameteriv) {
-        void **procp = (void **) &disp->SamplerParameteriv;
-
-        snprintf(symboln, sizeof(symboln), "%sSamplerParameteriv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorP3ui) {
-        void **procp = (void **) &disp->ColorP3ui;
-
-        snprintf(symboln, sizeof(symboln), "%sColorP3ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorP3uiv) {
-        void **procp = (void **) &disp->ColorP3uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sColorP3uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorP4ui) {
-        void **procp = (void **) &disp->ColorP4ui;
-
-        snprintf(symboln, sizeof(symboln), "%sColorP4ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorP4uiv) {
-        void **procp = (void **) &disp->ColorP4uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sColorP4uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoordP1ui) {
-        void **procp = (void **) &disp->MultiTexCoordP1ui;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP1ui",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoordP1uiv) {
-        void **procp = (void **) &disp->MultiTexCoordP1uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP1uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoordP2ui) {
-        void **procp = (void **) &disp->MultiTexCoordP2ui;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP2ui",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoordP2uiv) {
-        void **procp = (void **) &disp->MultiTexCoordP2uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP2uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoordP3ui) {
-        void **procp = (void **) &disp->MultiTexCoordP3ui;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP3ui",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoordP3uiv) {
-        void **procp = (void **) &disp->MultiTexCoordP3uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP3uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoordP4ui) {
-        void **procp = (void **) &disp->MultiTexCoordP4ui;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP4ui",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiTexCoordP4uiv) {
-        void **procp = (void **) &disp->MultiTexCoordP4uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP4uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->NormalP3ui) {
-        void **procp = (void **) &disp->NormalP3ui;
-
-        snprintf(symboln, sizeof(symboln), "%sNormalP3ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->NormalP3uiv) {
-        void **procp = (void **) &disp->NormalP3uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sNormalP3uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColorP3ui) {
-        void **procp = (void **) &disp->SecondaryColorP3ui;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColorP3ui",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColorP3uiv) {
-        void **procp = (void **) &disp->SecondaryColorP3uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColorP3uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoordP1ui) {
-        void **procp = (void **) &disp->TexCoordP1ui;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP1ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoordP1uiv) {
-        void **procp = (void **) &disp->TexCoordP1uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP1uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoordP2ui) {
-        void **procp = (void **) &disp->TexCoordP2ui;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP2ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoordP2uiv) {
-        void **procp = (void **) &disp->TexCoordP2uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP2uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoordP3ui) {
-        void **procp = (void **) &disp->TexCoordP3ui;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP3ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoordP3uiv) {
-        void **procp = (void **) &disp->TexCoordP3uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP3uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoordP4ui) {
-        void **procp = (void **) &disp->TexCoordP4ui;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP4ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoordP4uiv) {
-        void **procp = (void **) &disp->TexCoordP4uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP4uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribP1ui) {
-        void **procp = (void **) &disp->VertexAttribP1ui;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP1ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribP1uiv) {
-        void **procp = (void **) &disp->VertexAttribP1uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP1uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribP2ui) {
-        void **procp = (void **) &disp->VertexAttribP2ui;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP2ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribP2uiv) {
-        void **procp = (void **) &disp->VertexAttribP2uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP2uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribP3ui) {
-        void **procp = (void **) &disp->VertexAttribP3ui;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP3ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribP3uiv) {
-        void **procp = (void **) &disp->VertexAttribP3uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP3uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribP4ui) {
-        void **procp = (void **) &disp->VertexAttribP4ui;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP4ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribP4uiv) {
-        void **procp = (void **) &disp->VertexAttribP4uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP4uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexP2ui) {
-        void **procp = (void **) &disp->VertexP2ui;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexP2ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexP2uiv) {
-        void **procp = (void **) &disp->VertexP2uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexP2uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexP3ui) {
-        void **procp = (void **) &disp->VertexP3ui;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexP3ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexP3uiv) {
-        void **procp = (void **) &disp->VertexP3uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexP3uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexP4ui) {
-        void **procp = (void **) &disp->VertexP4ui;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexP4ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexP4uiv) {
-        void **procp = (void **) &disp->VertexP4uiv;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexP4uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindTransformFeedback) {
-        void **procp = (void **) &disp->BindTransformFeedback;
-
-        snprintf(symboln, sizeof(symboln), "%sBindTransformFeedback",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteTransformFeedbacks) {
-        void **procp = (void **) &disp->DeleteTransformFeedbacks;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteTransformFeedbacks",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DrawTransformFeedback) {
-        void **procp = (void **) &disp->DrawTransformFeedback;
-
-        snprintf(symboln, sizeof(symboln), "%sDrawTransformFeedback",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenTransformFeedbacks) {
-        void **procp = (void **) &disp->GenTransformFeedbacks;
-
-        snprintf(symboln, sizeof(symboln), "%sGenTransformFeedbacks",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsTransformFeedback) {
-        void **procp = (void **) &disp->IsTransformFeedback;
-
-        snprintf(symboln, sizeof(symboln), "%sIsTransformFeedback",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PauseTransformFeedback) {
-        void **procp = (void **) &disp->PauseTransformFeedback;
-
-        snprintf(symboln, sizeof(symboln), "%sPauseTransformFeedback",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ResumeTransformFeedback) {
-        void **procp = (void **) &disp->ResumeTransformFeedback;
-
-        snprintf(symboln, sizeof(symboln), "%sResumeTransformFeedback",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClearDepthf) {
-        void **procp = (void **) &disp->ClearDepthf;
-
-        snprintf(symboln, sizeof(symboln), "%sClearDepthf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DepthRangef) {
-        void **procp = (void **) &disp->DepthRangef;
-
-        snprintf(symboln, sizeof(symboln), "%sDepthRangef", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetShaderPrecisionFormat) {
-        void **procp = (void **) &disp->GetShaderPrecisionFormat;
-
-        snprintf(symboln, sizeof(symboln), "%sGetShaderPrecisionFormat",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ReleaseShaderCompiler) {
-        void **procp = (void **) &disp->ReleaseShaderCompiler;
-
-        snprintf(symboln, sizeof(symboln), "%sReleaseShaderCompiler",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ShaderBinary) {
-        void **procp = (void **) &disp->ShaderBinary;
-
-        snprintf(symboln, sizeof(symboln), "%sShaderBinary", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetGraphicsResetStatusARB) {
-        void **procp = (void **) &disp->GetGraphicsResetStatusARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetGraphicsResetStatusARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnColorTableARB) {
-        void **procp = (void **) &disp->GetnColorTableARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnColorTableARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnCompressedTexImageARB) {
-        void **procp = (void **) &disp->GetnCompressedTexImageARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnCompressedTexImageARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnConvolutionFilterARB) {
-        void **procp = (void **) &disp->GetnConvolutionFilterARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnConvolutionFilterARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnHistogramARB) {
-        void **procp = (void **) &disp->GetnHistogramARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnHistogramARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnMapdvARB) {
-        void **procp = (void **) &disp->GetnMapdvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnMapdvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnMapfvARB) {
-        void **procp = (void **) &disp->GetnMapfvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnMapfvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnMapivARB) {
-        void **procp = (void **) &disp->GetnMapivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnMapivARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnMinmaxARB) {
-        void **procp = (void **) &disp->GetnMinmaxARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnMinmaxARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnPixelMapfvARB) {
-        void **procp = (void **) &disp->GetnPixelMapfvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnPixelMapfvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnPixelMapuivARB) {
-        void **procp = (void **) &disp->GetnPixelMapuivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnPixelMapuivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnPixelMapusvARB) {
-        void **procp = (void **) &disp->GetnPixelMapusvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnPixelMapusvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnPolygonStippleARB) {
-        void **procp = (void **) &disp->GetnPolygonStippleARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnPolygonStippleARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnSeparableFilterARB) {
-        void **procp = (void **) &disp->GetnSeparableFilterARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnSeparableFilterARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnTexImageARB) {
-        void **procp = (void **) &disp->GetnTexImageARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnTexImageARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnUniformdvARB) {
-        void **procp = (void **) &disp->GetnUniformdvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnUniformdvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnUniformfvARB) {
-        void **procp = (void **) &disp->GetnUniformfvARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnUniformfvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnUniformivARB) {
-        void **procp = (void **) &disp->GetnUniformivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnUniformivARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetnUniformuivARB) {
-        void **procp = (void **) &disp->GetnUniformuivARB;
-
-        snprintf(symboln, sizeof(symboln), "%sGetnUniformuivARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ReadnPixelsARB) {
-        void **procp = (void **) &disp->ReadnPixelsARB;
-
-        snprintf(symboln, sizeof(symboln), "%sReadnPixelsARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexStorage1D) {
-        void **procp = (void **) &disp->TexStorage1D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexStorage1D", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexStorage2D) {
-        void **procp = (void **) &disp->TexStorage2D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexStorage2D", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexStorage3D) {
-        void **procp = (void **) &disp->TexStorage3D;
-
-        snprintf(symboln, sizeof(symboln), "%sTexStorage3D", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TextureStorage1DEXT) {
-        void **procp = (void **) &disp->TextureStorage1DEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sTextureStorage1DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TextureStorage2DEXT) {
-        void **procp = (void **) &disp->TextureStorage2DEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sTextureStorage2DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TextureStorage3DEXT) {
-        void **procp = (void **) &disp->TextureStorage3DEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sTextureStorage3DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PolygonOffsetEXT) {
-        void **procp = (void **) &disp->PolygonOffsetEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sPolygonOffsetEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetPixelTexGenParameterfvSGIS) {
-        void **procp = (void **) &disp->GetPixelTexGenParameterfvSGIS;
-
-        snprintf(symboln, sizeof(symboln), "%sGetPixelTexGenParameterfvSGIS",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetPixelTexGenParameterivSGIS) {
-        void **procp = (void **) &disp->GetPixelTexGenParameterivSGIS;
-
-        snprintf(symboln, sizeof(symboln), "%sGetPixelTexGenParameterivSGIS",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelTexGenParameterfSGIS) {
-        void **procp = (void **) &disp->PixelTexGenParameterfSGIS;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelTexGenParameterfSGIS",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelTexGenParameterfvSGIS) {
-        void **procp = (void **) &disp->PixelTexGenParameterfvSGIS;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelTexGenParameterfvSGIS",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelTexGenParameteriSGIS) {
-        void **procp = (void **) &disp->PixelTexGenParameteriSGIS;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelTexGenParameteriSGIS",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelTexGenParameterivSGIS) {
-        void **procp = (void **) &disp->PixelTexGenParameterivSGIS;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelTexGenParameterivSGIS",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SampleMaskSGIS) {
-        void **procp = (void **) &disp->SampleMaskSGIS;
-
-        snprintf(symboln, sizeof(symboln), "%sSampleMaskSGIS", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SampleMaskSGIS) {
-        void **procp = (void **) &disp->SampleMaskSGIS;
-
-        snprintf(symboln, sizeof(symboln), "%sSampleMaskEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SamplePatternSGIS) {
-        void **procp = (void **) &disp->SamplePatternSGIS;
-
-        snprintf(symboln, sizeof(symboln), "%sSamplePatternSGIS",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SamplePatternSGIS) {
-        void **procp = (void **) &disp->SamplePatternSGIS;
-
-        snprintf(symboln, sizeof(symboln), "%sSamplePatternEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorPointerEXT) {
-        void **procp = (void **) &disp->ColorPointerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sColorPointerEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EdgeFlagPointerEXT) {
-        void **procp = (void **) &disp->EdgeFlagPointerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sEdgeFlagPointerEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IndexPointerEXT) {
-        void **procp = (void **) &disp->IndexPointerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sIndexPointerEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->NormalPointerEXT) {
-        void **procp = (void **) &disp->NormalPointerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sNormalPointerEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexCoordPointerEXT) {
-        void **procp = (void **) &disp->TexCoordPointerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sTexCoordPointerEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexPointerEXT) {
-        void **procp = (void **) &disp->VertexPointerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexPointerEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointParameterfEXT) {
-        void **procp = (void **) &disp->PointParameterfEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sPointParameterf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointParameterfEXT) {
-        void **procp = (void **) &disp->PointParameterfEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointParameterfEXT) {
-        void **procp = (void **) &disp->PointParameterfEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointParameterfEXT) {
-        void **procp = (void **) &disp->PointParameterfEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfSGIS",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointParameterfvEXT) {
-        void **procp = (void **) &disp->PointParameterfvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointParameterfvEXT) {
-        void **procp = (void **) &disp->PointParameterfvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfvARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointParameterfvEXT) {
-        void **procp = (void **) &disp->PointParameterfvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointParameterfvEXT) {
-        void **procp = (void **) &disp->PointParameterfvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfvSGIS",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LockArraysEXT) {
-        void **procp = (void **) &disp->LockArraysEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sLockArraysEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UnlockArraysEXT) {
-        void **procp = (void **) &disp->UnlockArraysEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUnlockArraysEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3bEXT) {
-        void **procp = (void **) &disp->SecondaryColor3bEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3b", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3bEXT) {
-        void **procp = (void **) &disp->SecondaryColor3bEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3bEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3bvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3bvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3bv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3bvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3bvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3bvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3dEXT) {
-        void **procp = (void **) &disp->SecondaryColor3dEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3dEXT) {
-        void **procp = (void **) &disp->SecondaryColor3dEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3dEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3dvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3dvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3dv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3dvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3dvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3dvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3fEXT) {
-        void **procp = (void **) &disp->SecondaryColor3fEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3fEXT) {
-        void **procp = (void **) &disp->SecondaryColor3fEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3fEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3fvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3fvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3fv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3fvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3fvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3fvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3iEXT) {
-        void **procp = (void **) &disp->SecondaryColor3iEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3iEXT) {
-        void **procp = (void **) &disp->SecondaryColor3iEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3iEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3ivEXT) {
-        void **procp = (void **) &disp->SecondaryColor3ivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3iv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3ivEXT) {
-        void **procp = (void **) &disp->SecondaryColor3ivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3sEXT) {
-        void **procp = (void **) &disp->SecondaryColor3sEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3sEXT) {
-        void **procp = (void **) &disp->SecondaryColor3sEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3sEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3svEXT) {
-        void **procp = (void **) &disp->SecondaryColor3svEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3sv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3svEXT) {
-        void **procp = (void **) &disp->SecondaryColor3svEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3svEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3ubEXT) {
-        void **procp = (void **) &disp->SecondaryColor3ubEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ub",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3ubEXT) {
-        void **procp = (void **) &disp->SecondaryColor3ubEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ubEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3ubvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3ubvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ubv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3ubvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3ubvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ubvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3uiEXT) {
-        void **procp = (void **) &disp->SecondaryColor3uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ui",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3uiEXT) {
-        void **procp = (void **) &disp->SecondaryColor3uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3uiEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3uivEXT) {
-        void **procp = (void **) &disp->SecondaryColor3uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3uivEXT) {
-        void **procp = (void **) &disp->SecondaryColor3uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3uivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3usEXT) {
-        void **procp = (void **) &disp->SecondaryColor3usEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3us",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3usEXT) {
-        void **procp = (void **) &disp->SecondaryColor3usEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3usEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3usvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3usvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3usv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColor3usvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3usvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3usvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColorPointerEXT) {
-        void **procp = (void **) &disp->SecondaryColorPointerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColorPointer",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SecondaryColorPointerEXT) {
-        void **procp = (void **) &disp->SecondaryColorPointerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColorPointerEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiDrawArraysEXT) {
-        void **procp = (void **) &disp->MultiDrawArraysEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiDrawArrays", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiDrawArraysEXT) {
-        void **procp = (void **) &disp->MultiDrawArraysEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiDrawArraysEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiDrawElementsEXT) {
-        void **procp = (void **) &disp->MultiDrawElementsEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiDrawElements",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiDrawElementsEXT) {
-        void **procp = (void **) &disp->MultiDrawElementsEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiDrawElementsEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FogCoordPointerEXT) {
-        void **procp = (void **) &disp->FogCoordPointerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFogCoordPointer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FogCoordPointerEXT) {
-        void **procp = (void **) &disp->FogCoordPointerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFogCoordPointerEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FogCoorddEXT) {
-        void **procp = (void **) &disp->FogCoorddEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFogCoordd", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FogCoorddEXT) {
-        void **procp = (void **) &disp->FogCoorddEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFogCoorddEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FogCoorddvEXT) {
-        void **procp = (void **) &disp->FogCoorddvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFogCoorddv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FogCoorddvEXT) {
-        void **procp = (void **) &disp->FogCoorddvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFogCoorddvEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FogCoordfEXT) {
-        void **procp = (void **) &disp->FogCoordfEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFogCoordf", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FogCoordfEXT) {
-        void **procp = (void **) &disp->FogCoordfEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFogCoordfEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FogCoordfvEXT) {
-        void **procp = (void **) &disp->FogCoordfvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFogCoordfv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FogCoordfvEXT) {
-        void **procp = (void **) &disp->FogCoordfvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFogCoordfvEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PixelTexGenSGIX) {
-        void **procp = (void **) &disp->PixelTexGenSGIX;
-
-        snprintf(symboln, sizeof(symboln), "%sPixelTexGenSGIX", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendFuncSeparateEXT) {
-        void **procp = (void **) &disp->BlendFuncSeparateEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparate",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendFuncSeparateEXT) {
-        void **procp = (void **) &disp->BlendFuncSeparateEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendFuncSeparateEXT) {
-        void **procp = (void **) &disp->BlendFuncSeparateEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateINGR",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FlushVertexArrayRangeNV) {
-        void **procp = (void **) &disp->FlushVertexArrayRangeNV;
-
-        snprintf(symboln, sizeof(symboln), "%sFlushVertexArrayRangeNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexArrayRangeNV) {
-        void **procp = (void **) &disp->VertexArrayRangeNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexArrayRangeNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CombinerInputNV) {
-        void **procp = (void **) &disp->CombinerInputNV;
-
-        snprintf(symboln, sizeof(symboln), "%sCombinerInputNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CombinerOutputNV) {
-        void **procp = (void **) &disp->CombinerOutputNV;
-
-        snprintf(symboln, sizeof(symboln), "%sCombinerOutputNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CombinerParameterfNV) {
-        void **procp = (void **) &disp->CombinerParameterfNV;
-
-        snprintf(symboln, sizeof(symboln), "%sCombinerParameterfNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CombinerParameterfvNV) {
-        void **procp = (void **) &disp->CombinerParameterfvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sCombinerParameterfvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CombinerParameteriNV) {
-        void **procp = (void **) &disp->CombinerParameteriNV;
-
-        snprintf(symboln, sizeof(symboln), "%sCombinerParameteriNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CombinerParameterivNV) {
-        void **procp = (void **) &disp->CombinerParameterivNV;
-
-        snprintf(symboln, sizeof(symboln), "%sCombinerParameterivNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FinalCombinerInputNV) {
-        void **procp = (void **) &disp->FinalCombinerInputNV;
-
-        snprintf(symboln, sizeof(symboln), "%sFinalCombinerInputNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetCombinerInputParameterfvNV) {
-        void **procp = (void **) &disp->GetCombinerInputParameterfvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetCombinerInputParameterfvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetCombinerInputParameterivNV) {
-        void **procp = (void **) &disp->GetCombinerInputParameterivNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetCombinerInputParameterivNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetCombinerOutputParameterfvNV) {
-        void **procp = (void **) &disp->GetCombinerOutputParameterfvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetCombinerOutputParameterfvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetCombinerOutputParameterivNV) {
-        void **procp = (void **) &disp->GetCombinerOutputParameterivNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetCombinerOutputParameterivNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetFinalCombinerInputParameterfvNV) {
-        void **procp = (void **) &disp->GetFinalCombinerInputParameterfvNV;
-
-        snprintf(symboln, sizeof(symboln),
-                 "%sGetFinalCombinerInputParameterfvNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetFinalCombinerInputParameterivNV) {
-        void **procp = (void **) &disp->GetFinalCombinerInputParameterivNV;
-
-        snprintf(symboln, sizeof(symboln),
-                 "%sGetFinalCombinerInputParameterivNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ResizeBuffersMESA) {
-        void **procp = (void **) &disp->ResizeBuffersMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sResizeBuffersMESA",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2dMESA) {
-        void **procp = (void **) &disp->WindowPos2dMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2dMESA) {
-        void **procp = (void **) &disp->WindowPos2dMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2dARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2dMESA) {
-        void **procp = (void **) &disp->WindowPos2dMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2dMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2dvMESA) {
-        void **procp = (void **) &disp->WindowPos2dvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2dvMESA) {
-        void **procp = (void **) &disp->WindowPos2dvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2dvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2dvMESA) {
-        void **procp = (void **) &disp->WindowPos2dvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2dvMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2fMESA) {
-        void **procp = (void **) &disp->WindowPos2fMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2fMESA) {
-        void **procp = (void **) &disp->WindowPos2fMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2fARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2fMESA) {
-        void **procp = (void **) &disp->WindowPos2fMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2fMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2fvMESA) {
-        void **procp = (void **) &disp->WindowPos2fvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2fvMESA) {
-        void **procp = (void **) &disp->WindowPos2fvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2fvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2fvMESA) {
-        void **procp = (void **) &disp->WindowPos2fvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2fvMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2iMESA) {
-        void **procp = (void **) &disp->WindowPos2iMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2iMESA) {
-        void **procp = (void **) &disp->WindowPos2iMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2iARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2iMESA) {
-        void **procp = (void **) &disp->WindowPos2iMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2iMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2ivMESA) {
-        void **procp = (void **) &disp->WindowPos2ivMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2ivMESA) {
-        void **procp = (void **) &disp->WindowPos2ivMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2ivARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2ivMESA) {
-        void **procp = (void **) &disp->WindowPos2ivMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2ivMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2sMESA) {
-        void **procp = (void **) &disp->WindowPos2sMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2sMESA) {
-        void **procp = (void **) &disp->WindowPos2sMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2sARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2sMESA) {
-        void **procp = (void **) &disp->WindowPos2sMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2sMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2svMESA) {
-        void **procp = (void **) &disp->WindowPos2svMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2svMESA) {
-        void **procp = (void **) &disp->WindowPos2svMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2svARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos2svMESA) {
-        void **procp = (void **) &disp->WindowPos2svMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2svMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3dMESA) {
-        void **procp = (void **) &disp->WindowPos3dMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3d", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3dMESA) {
-        void **procp = (void **) &disp->WindowPos3dMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3dARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3dMESA) {
-        void **procp = (void **) &disp->WindowPos3dMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3dMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3dvMESA) {
-        void **procp = (void **) &disp->WindowPos3dvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3dv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3dvMESA) {
-        void **procp = (void **) &disp->WindowPos3dvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3dvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3dvMESA) {
-        void **procp = (void **) &disp->WindowPos3dvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3dvMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3fMESA) {
-        void **procp = (void **) &disp->WindowPos3fMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3f", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3fMESA) {
-        void **procp = (void **) &disp->WindowPos3fMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3fARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3fMESA) {
-        void **procp = (void **) &disp->WindowPos3fMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3fMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3fvMESA) {
-        void **procp = (void **) &disp->WindowPos3fvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3fv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3fvMESA) {
-        void **procp = (void **) &disp->WindowPos3fvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3fvARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3fvMESA) {
-        void **procp = (void **) &disp->WindowPos3fvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3fvMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3iMESA) {
-        void **procp = (void **) &disp->WindowPos3iMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3iMESA) {
-        void **procp = (void **) &disp->WindowPos3iMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3iARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3iMESA) {
-        void **procp = (void **) &disp->WindowPos3iMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3iMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3ivMESA) {
-        void **procp = (void **) &disp->WindowPos3ivMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3ivMESA) {
-        void **procp = (void **) &disp->WindowPos3ivMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3ivARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3ivMESA) {
-        void **procp = (void **) &disp->WindowPos3ivMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3ivMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3sMESA) {
-        void **procp = (void **) &disp->WindowPos3sMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3s", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3sMESA) {
-        void **procp = (void **) &disp->WindowPos3sMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3sARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3sMESA) {
-        void **procp = (void **) &disp->WindowPos3sMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3sMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3svMESA) {
-        void **procp = (void **) &disp->WindowPos3svMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3svMESA) {
-        void **procp = (void **) &disp->WindowPos3svMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3svARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos3svMESA) {
-        void **procp = (void **) &disp->WindowPos3svMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3svMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos4dMESA) {
-        void **procp = (void **) &disp->WindowPos4dMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4dMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos4dvMESA) {
-        void **procp = (void **) &disp->WindowPos4dvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4dvMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos4fMESA) {
-        void **procp = (void **) &disp->WindowPos4fMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4fMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos4fvMESA) {
-        void **procp = (void **) &disp->WindowPos4fvMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4fvMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos4iMESA) {
-        void **procp = (void **) &disp->WindowPos4iMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4iMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos4ivMESA) {
-        void **procp = (void **) &disp->WindowPos4ivMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4ivMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos4sMESA) {
-        void **procp = (void **) &disp->WindowPos4sMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4sMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->WindowPos4svMESA) {
-        void **procp = (void **) &disp->WindowPos4svMESA;
-
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4svMESA", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiModeDrawArraysIBM) {
-        void **procp = (void **) &disp->MultiModeDrawArraysIBM;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiModeDrawArraysIBM",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->MultiModeDrawElementsIBM) {
-        void **procp = (void **) &disp->MultiModeDrawElementsIBM;
-
-        snprintf(symboln, sizeof(symboln), "%sMultiModeDrawElementsIBM",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteFencesNV) {
-        void **procp = (void **) &disp->DeleteFencesNV;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteFencesNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FinishFenceNV) {
-        void **procp = (void **) &disp->FinishFenceNV;
-
-        snprintf(symboln, sizeof(symboln), "%sFinishFenceNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenFencesNV) {
-        void **procp = (void **) &disp->GenFencesNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGenFencesNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetFenceivNV) {
-        void **procp = (void **) &disp->GetFenceivNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetFenceivNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsFenceNV) {
-        void **procp = (void **) &disp->IsFenceNV;
-
-        snprintf(symboln, sizeof(symboln), "%sIsFenceNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SetFenceNV) {
-        void **procp = (void **) &disp->SetFenceNV;
-
-        snprintf(symboln, sizeof(symboln), "%sSetFenceNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TestFenceNV) {
-        void **procp = (void **) &disp->TestFenceNV;
-
-        snprintf(symboln, sizeof(symboln), "%sTestFenceNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->AreProgramsResidentNV) {
-        void **procp = (void **) &disp->AreProgramsResidentNV;
-
-        snprintf(symboln, sizeof(symboln), "%sAreProgramsResidentNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindProgramNV) {
-        void **procp = (void **) &disp->BindProgramNV;
-
-        snprintf(symboln, sizeof(symboln), "%sBindProgramARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindProgramNV) {
-        void **procp = (void **) &disp->BindProgramNV;
-
-        snprintf(symboln, sizeof(symboln), "%sBindProgramNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteProgramsNV) {
-        void **procp = (void **) &disp->DeleteProgramsNV;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteProgramsARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteProgramsNV) {
-        void **procp = (void **) &disp->DeleteProgramsNV;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteProgramsNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ExecuteProgramNV) {
-        void **procp = (void **) &disp->ExecuteProgramNV;
-
-        snprintf(symboln, sizeof(symboln), "%sExecuteProgramNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenProgramsNV) {
-        void **procp = (void **) &disp->GenProgramsNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGenProgramsARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenProgramsNV) {
-        void **procp = (void **) &disp->GenProgramsNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGenProgramsNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramParameterdvNV) {
-        void **procp = (void **) &disp->GetProgramParameterdvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramParameterdvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramParameterfvNV) {
-        void **procp = (void **) &disp->GetProgramParameterfvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramParameterfvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramStringNV) {
-        void **procp = (void **) &disp->GetProgramStringNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramStringNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramivNV) {
-        void **procp = (void **) &disp->GetProgramivNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramivNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTrackMatrixivNV) {
-        void **procp = (void **) &disp->GetTrackMatrixivNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTrackMatrixivNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribPointervNV) {
-        void **procp = (void **) &disp->GetVertexAttribPointervNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribPointerv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribPointervNV) {
-        void **procp = (void **) &disp->GetVertexAttribPointervNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribPointervARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribPointervNV) {
-        void **procp = (void **) &disp->GetVertexAttribPointervNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribPointervNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribdvNV) {
-        void **procp = (void **) &disp->GetVertexAttribdvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribdvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribfvNV) {
-        void **procp = (void **) &disp->GetVertexAttribfvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribfvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribivNV) {
-        void **procp = (void **) &disp->GetVertexAttribivNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribivNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsProgramNV) {
-        void **procp = (void **) &disp->IsProgramNV;
-
-        snprintf(symboln, sizeof(symboln), "%sIsProgramARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsProgramNV) {
-        void **procp = (void **) &disp->IsProgramNV;
-
-        snprintf(symboln, sizeof(symboln), "%sIsProgramNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->LoadProgramNV) {
-        void **procp = (void **) &disp->LoadProgramNV;
-
-        snprintf(symboln, sizeof(symboln), "%sLoadProgramNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramParameters4dvNV) {
-        void **procp = (void **) &disp->ProgramParameters4dvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramParameters4dvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramParameters4fvNV) {
-        void **procp = (void **) &disp->ProgramParameters4fvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramParameters4fvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RequestResidentProgramsNV) {
-        void **procp = (void **) &disp->RequestResidentProgramsNV;
-
-        snprintf(symboln, sizeof(symboln), "%sRequestResidentProgramsNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TrackMatrixNV) {
-        void **procp = (void **) &disp->TrackMatrixNV;
-
-        snprintf(symboln, sizeof(symboln), "%sTrackMatrixNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1dNV) {
-        void **procp = (void **) &disp->VertexAttrib1dNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1dvNV) {
-        void **procp = (void **) &disp->VertexAttrib1dvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1fNV) {
-        void **procp = (void **) &disp->VertexAttrib1fNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1fvNV) {
-        void **procp = (void **) &disp->VertexAttrib1fvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1sNV) {
-        void **procp = (void **) &disp->VertexAttrib1sNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1sNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib1svNV) {
-        void **procp = (void **) &disp->VertexAttrib1svNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1svNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2dNV) {
-        void **procp = (void **) &disp->VertexAttrib2dNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2dvNV) {
-        void **procp = (void **) &disp->VertexAttrib2dvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2fNV) {
-        void **procp = (void **) &disp->VertexAttrib2fNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2fvNV) {
-        void **procp = (void **) &disp->VertexAttrib2fvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2sNV) {
-        void **procp = (void **) &disp->VertexAttrib2sNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2sNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib2svNV) {
-        void **procp = (void **) &disp->VertexAttrib2svNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2svNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3dNV) {
-        void **procp = (void **) &disp->VertexAttrib3dNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3dvNV) {
-        void **procp = (void **) &disp->VertexAttrib3dvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3fNV) {
-        void **procp = (void **) &disp->VertexAttrib3fNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3fvNV) {
-        void **procp = (void **) &disp->VertexAttrib3fvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3sNV) {
-        void **procp = (void **) &disp->VertexAttrib3sNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3sNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib3svNV) {
-        void **procp = (void **) &disp->VertexAttrib3svNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3svNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4dNV) {
-        void **procp = (void **) &disp->VertexAttrib4dNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4dvNV) {
-        void **procp = (void **) &disp->VertexAttrib4dvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4fNV) {
-        void **procp = (void **) &disp->VertexAttrib4fNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4fvNV) {
-        void **procp = (void **) &disp->VertexAttrib4fvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4sNV) {
-        void **procp = (void **) &disp->VertexAttrib4sNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4sNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4svNV) {
-        void **procp = (void **) &disp->VertexAttrib4svNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4svNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4ubNV) {
-        void **procp = (void **) &disp->VertexAttrib4ubNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ubNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttrib4ubvNV) {
-        void **procp = (void **) &disp->VertexAttrib4ubvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ubvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribPointerNV) {
-        void **procp = (void **) &disp->VertexAttribPointerNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribPointerNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs1dvNV) {
-        void **procp = (void **) &disp->VertexAttribs1dvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs1dvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs1fvNV) {
-        void **procp = (void **) &disp->VertexAttribs1fvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs1fvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs1svNV) {
-        void **procp = (void **) &disp->VertexAttribs1svNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs1svNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs2dvNV) {
-        void **procp = (void **) &disp->VertexAttribs2dvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs2dvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs2fvNV) {
-        void **procp = (void **) &disp->VertexAttribs2fvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs2fvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs2svNV) {
-        void **procp = (void **) &disp->VertexAttribs2svNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs2svNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs3dvNV) {
-        void **procp = (void **) &disp->VertexAttribs3dvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs3dvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs3fvNV) {
-        void **procp = (void **) &disp->VertexAttribs3fvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs3fvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs3svNV) {
-        void **procp = (void **) &disp->VertexAttribs3svNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs3svNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs4dvNV) {
-        void **procp = (void **) &disp->VertexAttribs4dvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs4dvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs4fvNV) {
-        void **procp = (void **) &disp->VertexAttribs4fvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs4fvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs4svNV) {
-        void **procp = (void **) &disp->VertexAttribs4svNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs4svNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribs4ubvNV) {
-        void **procp = (void **) &disp->VertexAttribs4ubvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs4ubvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexBumpParameterfvATI) {
-        void **procp = (void **) &disp->GetTexBumpParameterfvATI;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexBumpParameterfvATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexBumpParameterivATI) {
-        void **procp = (void **) &disp->GetTexBumpParameterivATI;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexBumpParameterivATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexBumpParameterfvATI) {
-        void **procp = (void **) &disp->TexBumpParameterfvATI;
-
-        snprintf(symboln, sizeof(symboln), "%sTexBumpParameterfvATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexBumpParameterivATI) {
-        void **procp = (void **) &disp->TexBumpParameterivATI;
-
-        snprintf(symboln, sizeof(symboln), "%sTexBumpParameterivATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->AlphaFragmentOp1ATI) {
-        void **procp = (void **) &disp->AlphaFragmentOp1ATI;
-
-        snprintf(symboln, sizeof(symboln), "%sAlphaFragmentOp1ATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->AlphaFragmentOp2ATI) {
-        void **procp = (void **) &disp->AlphaFragmentOp2ATI;
-
-        snprintf(symboln, sizeof(symboln), "%sAlphaFragmentOp2ATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->AlphaFragmentOp3ATI) {
-        void **procp = (void **) &disp->AlphaFragmentOp3ATI;
-
-        snprintf(symboln, sizeof(symboln), "%sAlphaFragmentOp3ATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BeginFragmentShaderATI) {
-        void **procp = (void **) &disp->BeginFragmentShaderATI;
-
-        snprintf(symboln, sizeof(symboln), "%sBeginFragmentShaderATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindFragmentShaderATI) {
-        void **procp = (void **) &disp->BindFragmentShaderATI;
-
-        snprintf(symboln, sizeof(symboln), "%sBindFragmentShaderATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorFragmentOp1ATI) {
-        void **procp = (void **) &disp->ColorFragmentOp1ATI;
-
-        snprintf(symboln, sizeof(symboln), "%sColorFragmentOp1ATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorFragmentOp2ATI) {
-        void **procp = (void **) &disp->ColorFragmentOp2ATI;
-
-        snprintf(symboln, sizeof(symboln), "%sColorFragmentOp2ATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorFragmentOp3ATI) {
-        void **procp = (void **) &disp->ColorFragmentOp3ATI;
-
-        snprintf(symboln, sizeof(symboln), "%sColorFragmentOp3ATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteFragmentShaderATI) {
-        void **procp = (void **) &disp->DeleteFragmentShaderATI;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteFragmentShaderATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EndFragmentShaderATI) {
-        void **procp = (void **) &disp->EndFragmentShaderATI;
-
-        snprintf(symboln, sizeof(symboln), "%sEndFragmentShaderATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenFragmentShadersATI) {
-        void **procp = (void **) &disp->GenFragmentShadersATI;
-
-        snprintf(symboln, sizeof(symboln), "%sGenFragmentShadersATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PassTexCoordATI) {
-        void **procp = (void **) &disp->PassTexCoordATI;
-
-        snprintf(symboln, sizeof(symboln), "%sPassTexCoordATI", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SampleMapATI) {
-        void **procp = (void **) &disp->SampleMapATI;
-
-        snprintf(symboln, sizeof(symboln), "%sSampleMapATI", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->SetFragmentShaderConstantATI) {
-        void **procp = (void **) &disp->SetFragmentShaderConstantATI;
-
-        snprintf(symboln, sizeof(symboln), "%sSetFragmentShaderConstantATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointParameteriNV) {
-        void **procp = (void **) &disp->PointParameteriNV;
-
-        snprintf(symboln, sizeof(symboln), "%sPointParameteri", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointParameteriNV) {
-        void **procp = (void **) &disp->PointParameteriNV;
-
-        snprintf(symboln, sizeof(symboln), "%sPointParameteriNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointParameterivNV) {
-        void **procp = (void **) &disp->PointParameterivNV;
-
-        snprintf(symboln, sizeof(symboln), "%sPointParameteriv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PointParameterivNV) {
-        void **procp = (void **) &disp->PointParameterivNV;
-
-        snprintf(symboln, sizeof(symboln), "%sPointParameterivNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ActiveStencilFaceEXT) {
-        void **procp = (void **) &disp->ActiveStencilFaceEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sActiveStencilFaceEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindVertexArrayAPPLE) {
-        void **procp = (void **) &disp->BindVertexArrayAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sBindVertexArrayAPPLE",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteVertexArraysAPPLE) {
-        void **procp = (void **) &disp->DeleteVertexArraysAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteVertexArrays",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteVertexArraysAPPLE) {
-        void **procp = (void **) &disp->DeleteVertexArraysAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteVertexArraysAPPLE",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenVertexArraysAPPLE) {
-        void **procp = (void **) &disp->GenVertexArraysAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sGenVertexArraysAPPLE",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsVertexArrayAPPLE) {
-        void **procp = (void **) &disp->IsVertexArrayAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sIsVertexArray", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsVertexArrayAPPLE) {
-        void **procp = (void **) &disp->IsVertexArrayAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sIsVertexArrayAPPLE",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramNamedParameterdvNV) {
-        void **procp = (void **) &disp->GetProgramNamedParameterdvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramNamedParameterdvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetProgramNamedParameterfvNV) {
-        void **procp = (void **) &disp->GetProgramNamedParameterfvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sGetProgramNamedParameterfvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramNamedParameter4dNV) {
-        void **procp = (void **) &disp->ProgramNamedParameter4dNV;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramNamedParameter4dNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramNamedParameter4dvNV) {
-        void **procp = (void **) &disp->ProgramNamedParameter4dvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramNamedParameter4dvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramNamedParameter4fNV) {
-        void **procp = (void **) &disp->ProgramNamedParameter4fNV;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramNamedParameter4fNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramNamedParameter4fvNV) {
-        void **procp = (void **) &disp->ProgramNamedParameter4fvNV;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramNamedParameter4fvNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PrimitiveRestartIndexNV) {
-        void **procp = (void **) &disp->PrimitiveRestartIndexNV;
-
-        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndexNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PrimitiveRestartIndexNV) {
-        void **procp = (void **) &disp->PrimitiveRestartIndexNV;
-
-        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndex",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->PrimitiveRestartNV) {
-        void **procp = (void **) &disp->PrimitiveRestartNV;
-
-        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DepthBoundsEXT) {
-        void **procp = (void **) &disp->DepthBoundsEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sDepthBoundsEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendEquationSeparateEXT) {
-        void **procp = (void **) &disp->BlendEquationSeparateEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparate",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendEquationSeparateEXT) {
-        void **procp = (void **) &disp->BlendEquationSeparateEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlendEquationSeparateEXT) {
-        void **procp = (void **) &disp->BlendEquationSeparateEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindFramebufferEXT) {
-        void **procp = (void **) &disp->BindFramebufferEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBindFramebuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindFramebufferEXT) {
-        void **procp = (void **) &disp->BindFramebufferEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBindFramebufferEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindRenderbufferEXT) {
-        void **procp = (void **) &disp->BindRenderbufferEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBindRenderbuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindRenderbufferEXT) {
-        void **procp = (void **) &disp->BindRenderbufferEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBindRenderbufferEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CheckFramebufferStatusEXT) {
-        void **procp = (void **) &disp->CheckFramebufferStatusEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sCheckFramebufferStatus",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CheckFramebufferStatusEXT) {
-        void **procp = (void **) &disp->CheckFramebufferStatusEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sCheckFramebufferStatusEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteFramebuffersEXT) {
-        void **procp = (void **) &disp->DeleteFramebuffersEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteFramebuffers",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteFramebuffersEXT) {
-        void **procp = (void **) &disp->DeleteFramebuffersEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteFramebuffersEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteRenderbuffersEXT) {
-        void **procp = (void **) &disp->DeleteRenderbuffersEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteRenderbuffers",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DeleteRenderbuffersEXT) {
-        void **procp = (void **) &disp->DeleteRenderbuffersEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sDeleteRenderbuffersEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FramebufferRenderbufferEXT) {
-        void **procp = (void **) &disp->FramebufferRenderbufferEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFramebufferRenderbuffer",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FramebufferRenderbufferEXT) {
-        void **procp = (void **) &disp->FramebufferRenderbufferEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFramebufferRenderbufferEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FramebufferTexture1DEXT) {
-        void **procp = (void **) &disp->FramebufferTexture1DEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture1D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FramebufferTexture1DEXT) {
-        void **procp = (void **) &disp->FramebufferTexture1DEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture1DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FramebufferTexture2DEXT) {
-        void **procp = (void **) &disp->FramebufferTexture2DEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture2D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FramebufferTexture2DEXT) {
-        void **procp = (void **) &disp->FramebufferTexture2DEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture2DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FramebufferTexture3DEXT) {
-        void **procp = (void **) &disp->FramebufferTexture3DEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture3D",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FramebufferTexture3DEXT) {
-        void **procp = (void **) &disp->FramebufferTexture3DEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture3DEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenFramebuffersEXT) {
-        void **procp = (void **) &disp->GenFramebuffersEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGenFramebuffers", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenFramebuffersEXT) {
-        void **procp = (void **) &disp->GenFramebuffersEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGenFramebuffersEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenRenderbuffersEXT) {
-        void **procp = (void **) &disp->GenRenderbuffersEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGenRenderbuffers", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenRenderbuffersEXT) {
-        void **procp = (void **) &disp->GenRenderbuffersEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGenRenderbuffersEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenerateMipmapEXT) {
-        void **procp = (void **) &disp->GenerateMipmapEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGenerateMipmap", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GenerateMipmapEXT) {
-        void **procp = (void **) &disp->GenerateMipmapEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGenerateMipmapEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetFramebufferAttachmentParameterivEXT) {
-        void **procp = (void **) &disp->GetFramebufferAttachmentParameterivEXT;
-
-        snprintf(symboln, sizeof(symboln),
-                 "%sGetFramebufferAttachmentParameteriv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetFramebufferAttachmentParameterivEXT) {
-        void **procp = (void **) &disp->GetFramebufferAttachmentParameterivEXT;
-
-        snprintf(symboln, sizeof(symboln),
-                 "%sGetFramebufferAttachmentParameterivEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetRenderbufferParameterivEXT) {
-        void **procp = (void **) &disp->GetRenderbufferParameterivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetRenderbufferParameteriv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetRenderbufferParameterivEXT) {
-        void **procp = (void **) &disp->GetRenderbufferParameterivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetRenderbufferParameterivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsFramebufferEXT) {
-        void **procp = (void **) &disp->IsFramebufferEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sIsFramebuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsFramebufferEXT) {
-        void **procp = (void **) &disp->IsFramebufferEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sIsFramebufferEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsRenderbufferEXT) {
-        void **procp = (void **) &disp->IsRenderbufferEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sIsRenderbuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsRenderbufferEXT) {
-        void **procp = (void **) &disp->IsRenderbufferEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sIsRenderbufferEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RenderbufferStorageEXT) {
-        void **procp = (void **) &disp->RenderbufferStorageEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sRenderbufferStorage",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->RenderbufferStorageEXT) {
-        void **procp = (void **) &disp->RenderbufferStorageEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sRenderbufferStorageEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlitFramebufferEXT) {
-        void **procp = (void **) &disp->BlitFramebufferEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBlitFramebuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BlitFramebufferEXT) {
-        void **procp = (void **) &disp->BlitFramebufferEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBlitFramebufferEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BufferParameteriAPPLE) {
-        void **procp = (void **) &disp->BufferParameteriAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sBufferParameteriAPPLE",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FlushMappedBufferRangeAPPLE) {
-        void **procp = (void **) &disp->FlushMappedBufferRangeAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sFlushMappedBufferRangeAPPLE",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindFragDataLocationEXT) {
-        void **procp = (void **) &disp->BindFragDataLocationEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBindFragDataLocationEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindFragDataLocationEXT) {
-        void **procp = (void **) &disp->BindFragDataLocationEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBindFragDataLocation",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetFragDataLocationEXT) {
-        void **procp = (void **) &disp->GetFragDataLocationEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetFragDataLocationEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetFragDataLocationEXT) {
-        void **procp = (void **) &disp->GetFragDataLocationEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetFragDataLocation",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetUniformuivEXT) {
-        void **procp = (void **) &disp->GetUniformuivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetUniformuivEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetUniformuivEXT) {
-        void **procp = (void **) &disp->GetUniformuivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetUniformuiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribIivEXT) {
-        void **procp = (void **) &disp->GetVertexAttribIivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribIivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribIivEXT) {
-        void **procp = (void **) &disp->GetVertexAttribIivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribIiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribIuivEXT) {
-        void **procp = (void **) &disp->GetVertexAttribIuivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribIuivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetVertexAttribIuivEXT) {
-        void **procp = (void **) &disp->GetVertexAttribIuivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribIuiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform1uiEXT) {
-        void **procp = (void **) &disp->Uniform1uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform1uiEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform1uiEXT) {
-        void **procp = (void **) &disp->Uniform1uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform1ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform1uivEXT) {
-        void **procp = (void **) &disp->Uniform1uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform1uivEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform1uivEXT) {
-        void **procp = (void **) &disp->Uniform1uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform1uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform2uiEXT) {
-        void **procp = (void **) &disp->Uniform2uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform2uiEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform2uiEXT) {
-        void **procp = (void **) &disp->Uniform2uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform2ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform2uivEXT) {
-        void **procp = (void **) &disp->Uniform2uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform2uivEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform2uivEXT) {
-        void **procp = (void **) &disp->Uniform2uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform2uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform3uiEXT) {
-        void **procp = (void **) &disp->Uniform3uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform3uiEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform3uiEXT) {
-        void **procp = (void **) &disp->Uniform3uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform3ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform3uivEXT) {
-        void **procp = (void **) &disp->Uniform3uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform3uivEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform3uivEXT) {
-        void **procp = (void **) &disp->Uniform3uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform3uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform4uiEXT) {
-        void **procp = (void **) &disp->Uniform4uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform4uiEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform4uiEXT) {
-        void **procp = (void **) &disp->Uniform4uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform4ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform4uivEXT) {
-        void **procp = (void **) &disp->Uniform4uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform4uivEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->Uniform4uivEXT) {
-        void **procp = (void **) &disp->Uniform4uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUniform4uiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI1iEXT) {
-        void **procp = (void **) &disp->VertexAttribI1iEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1iEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI1iEXT) {
-        void **procp = (void **) &disp->VertexAttribI1iEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI1ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI1ivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1ivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI1ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI1ivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI1uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI1uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1uiEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI1uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI1uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI1uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI1uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1uivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI1uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI1uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI2iEXT) {
-        void **procp = (void **) &disp->VertexAttribI2iEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2iEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI2iEXT) {
-        void **procp = (void **) &disp->VertexAttribI2iEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI2ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI2ivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2ivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI2ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI2ivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI2uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI2uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2uiEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI2uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI2uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI2uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI2uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2uivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI2uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI2uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI3iEXT) {
-        void **procp = (void **) &disp->VertexAttribI3iEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3iEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI3iEXT) {
-        void **procp = (void **) &disp->VertexAttribI3iEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI3ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI3ivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3ivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI3ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI3ivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI3uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI3uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3uiEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI3uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI3uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI3uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI3uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3uivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI3uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI3uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4bvEXT) {
-        void **procp = (void **) &disp->VertexAttribI4bvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4bvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4bvEXT) {
-        void **procp = (void **) &disp->VertexAttribI4bvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4bv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4iEXT) {
-        void **procp = (void **) &disp->VertexAttribI4iEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4iEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4iEXT) {
-        void **procp = (void **) &disp->VertexAttribI4iEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4i", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI4ivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4ivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI4ivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4iv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4svEXT) {
-        void **procp = (void **) &disp->VertexAttribI4svEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4svEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4svEXT) {
-        void **procp = (void **) &disp->VertexAttribI4svEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4sv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4ubvEXT) {
-        void **procp = (void **) &disp->VertexAttribI4ubvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4ubvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4ubvEXT) {
-        void **procp = (void **) &disp->VertexAttribI4ubvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4ubv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI4uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4uiEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI4uiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4ui", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI4uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4uivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI4uivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4uiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4usvEXT) {
-        void **procp = (void **) &disp->VertexAttribI4usvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4usvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribI4usvEXT) {
-        void **procp = (void **) &disp->VertexAttribI4usvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4usv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribIPointerEXT) {
-        void **procp = (void **) &disp->VertexAttribIPointerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribIPointerEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->VertexAttribIPointerEXT) {
-        void **procp = (void **) &disp->VertexAttribIPointerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribIPointer",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FramebufferTextureLayerEXT) {
-        void **procp = (void **) &disp->FramebufferTextureLayerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureLayer",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FramebufferTextureLayerEXT) {
-        void **procp = (void **) &disp->FramebufferTextureLayerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureLayerARB",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->FramebufferTextureLayerEXT) {
-        void **procp = (void **) &disp->FramebufferTextureLayerEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureLayerEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorMaskIndexedEXT) {
-        void **procp = (void **) &disp->ColorMaskIndexedEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sColorMaskIndexedEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ColorMaskIndexedEXT) {
-        void **procp = (void **) &disp->ColorMaskIndexedEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sColorMaski", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DisableIndexedEXT) {
-        void **procp = (void **) &disp->DisableIndexedEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sDisableIndexedEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->DisableIndexedEXT) {
-        void **procp = (void **) &disp->DisableIndexedEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sDisablei", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EnableIndexedEXT) {
-        void **procp = (void **) &disp->EnableIndexedEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sEnableIndexedEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EnableIndexedEXT) {
-        void **procp = (void **) &disp->EnableIndexedEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sEnablei", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetBooleanIndexedvEXT) {
-        void **procp = (void **) &disp->GetBooleanIndexedvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetBooleanIndexedvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetBooleanIndexedvEXT) {
-        void **procp = (void **) &disp->GetBooleanIndexedvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetBooleani_v", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetIntegerIndexedvEXT) {
-        void **procp = (void **) &disp->GetIntegerIndexedvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetIntegerIndexedvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetIntegerIndexedvEXT) {
-        void **procp = (void **) &disp->GetIntegerIndexedvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetIntegeri_v", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsEnabledIndexedEXT) {
-        void **procp = (void **) &disp->IsEnabledIndexedEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sIsEnabledIndexedEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->IsEnabledIndexedEXT) {
-        void **procp = (void **) &disp->IsEnabledIndexedEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sIsEnabledi", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClearColorIiEXT) {
-        void **procp = (void **) &disp->ClearColorIiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sClearColorIiEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ClearColorIuiEXT) {
-        void **procp = (void **) &disp->ClearColorIuiEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sClearColorIuiEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexParameterIivEXT) {
-        void **procp = (void **) &disp->GetTexParameterIivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameterIivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexParameterIivEXT) {
-        void **procp = (void **) &disp->GetTexParameterIivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameterIiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexParameterIuivEXT) {
-        void **procp = (void **) &disp->GetTexParameterIuivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameterIuivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexParameterIuivEXT) {
-        void **procp = (void **) &disp->GetTexParameterIuivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameterIuiv",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexParameterIivEXT) {
-        void **procp = (void **) &disp->TexParameterIivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sTexParameterIivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexParameterIivEXT) {
-        void **procp = (void **) &disp->TexParameterIivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sTexParameterIiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexParameterIuivEXT) {
-        void **procp = (void **) &disp->TexParameterIuivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sTexParameterIuivEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TexParameterIuivEXT) {
-        void **procp = (void **) &disp->TexParameterIuivEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sTexParameterIuiv", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BeginConditionalRenderNV) {
-        void **procp = (void **) &disp->BeginConditionalRenderNV;
-
-        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRenderNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BeginConditionalRenderNV) {
-        void **procp = (void **) &disp->BeginConditionalRenderNV;
-
-        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRender",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EndConditionalRenderNV) {
-        void **procp = (void **) &disp->EndConditionalRenderNV;
-
-        snprintf(symboln, sizeof(symboln), "%sEndConditionalRenderNV",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EndConditionalRenderNV) {
-        void **procp = (void **) &disp->EndConditionalRenderNV;
-
-        snprintf(symboln, sizeof(symboln), "%sEndConditionalRender",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BeginTransformFeedbackEXT) {
-        void **procp = (void **) &disp->BeginTransformFeedbackEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedbackEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BeginTransformFeedbackEXT) {
-        void **procp = (void **) &disp->BeginTransformFeedbackEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedback",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindBufferBaseEXT) {
-        void **procp = (void **) &disp->BindBufferBaseEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBindBufferBaseEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindBufferBaseEXT) {
-        void **procp = (void **) &disp->BindBufferBaseEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBindBufferBase", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindBufferOffsetEXT) {
-        void **procp = (void **) &disp->BindBufferOffsetEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBindBufferOffsetEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindBufferRangeEXT) {
-        void **procp = (void **) &disp->BindBufferRangeEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBindBufferRangeEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->BindBufferRangeEXT) {
-        void **procp = (void **) &disp->BindBufferRangeEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sBindBufferRange", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EndTransformFeedbackEXT) {
-        void **procp = (void **) &disp->EndTransformFeedbackEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedbackEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EndTransformFeedbackEXT) {
-        void **procp = (void **) &disp->EndTransformFeedbackEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedback",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTransformFeedbackVaryingEXT) {
-        void **procp = (void **) &disp->GetTransformFeedbackVaryingEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVaryingEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTransformFeedbackVaryingEXT) {
-        void **procp = (void **) &disp->GetTransformFeedbackVaryingEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVarying",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TransformFeedbackVaryingsEXT) {
-        void **procp = (void **) &disp->TransformFeedbackVaryingsEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryingsEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TransformFeedbackVaryingsEXT) {
-        void **procp = (void **) &disp->TransformFeedbackVaryingsEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryings",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProvokingVertexEXT) {
-        void **procp = (void **) &disp->ProvokingVertexEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sProvokingVertexEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProvokingVertexEXT) {
-        void **procp = (void **) &disp->ProvokingVertexEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sProvokingVertex", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetTexParameterPointervAPPLE) {
-        void **procp = (void **) &disp->GetTexParameterPointervAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameterPointervAPPLE",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TextureRangeAPPLE) {
-        void **procp = (void **) &disp->TextureRangeAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sTextureRangeAPPLE",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetObjectParameterivAPPLE) {
-        void **procp = (void **) &disp->GetObjectParameterivAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sGetObjectParameterivAPPLE",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ObjectPurgeableAPPLE) {
-        void **procp = (void **) &disp->ObjectPurgeableAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sObjectPurgeableAPPLE",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ObjectUnpurgeableAPPLE) {
-        void **procp = (void **) &disp->ObjectUnpurgeableAPPLE;
-
-        snprintf(symboln, sizeof(symboln), "%sObjectUnpurgeableAPPLE",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ActiveProgramEXT) {
-        void **procp = (void **) &disp->ActiveProgramEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sActiveProgramEXT", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->CreateShaderProgramEXT) {
-        void **procp = (void **) &disp->CreateShaderProgramEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sCreateShaderProgramEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->UseShaderProgramEXT) {
-        void **procp = (void **) &disp->UseShaderProgramEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sUseShaderProgramEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->TextureBarrierNV) {
-        void **procp = (void **) &disp->TextureBarrierNV;
-
-        snprintf(symboln, sizeof(symboln), "%sTextureBarrierNV", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->StencilFuncSeparateATI) {
-        void **procp = (void **) &disp->StencilFuncSeparateATI;
-
-        snprintf(symboln, sizeof(symboln), "%sStencilFuncSeparateATI",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramEnvParameters4fvEXT) {
-        void **procp = (void **) &disp->ProgramEnvParameters4fvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameters4fvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->ProgramLocalParameters4fvEXT) {
-        void **procp = (void **) &disp->ProgramLocalParameters4fvEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameters4fvEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetQueryObjecti64vEXT) {
-        void **procp = (void **) &disp->GetQueryObjecti64vEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetQueryObjecti64vEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->GetQueryObjectui64vEXT) {
-        void **procp = (void **) &disp->GetQueryObjectui64vEXT;
-
-        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectui64vEXT",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EGLImageTargetRenderbufferStorageOES) {
-        void **procp = (void **) &disp->EGLImageTargetRenderbufferStorageOES;
-
-        snprintf(symboln, sizeof(symboln),
-                 "%sEGLImageTargetRenderbufferStorageOES", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    if (!disp->EGLImageTargetTexture2DOES) {
-        void **procp = (void **) &disp->EGLImageTargetTexture2DOES;
-
-        snprintf(symboln, sizeof(symboln), "%sEGLImageTargetTexture2DOES",
-                 symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-    __glapi_gentable_set_remaining_noop(disp);
-
-    return disp;
-}
diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h
deleted file mode 100644
index f7e7c6c97..000000000
--- a/xorg-server/glx/glapitable.h
+++ /dev/null
@@ -1,1016 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by gl_table.py (from Mesa) script */
-
-/*
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
- * (C) Copyright IBM Corporation 2004
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL, IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#if !defined( _GLAPI_TABLE_H_ )
-#define _GLAPI_TABLE_H_
-
-#ifndef GLAPIENTRYP
-#ifndef GLAPIENTRY
-#define GLAPIENTRY
-#endif
-
-#define GLAPIENTRYP GLAPIENTRY *
-#endif
-
-struct _glapi_table {
-    void (GLAPIENTRYP NewList) (GLuint list, GLenum mode);      /* 0 */
-    void (GLAPIENTRYP EndList) (void);  /* 1 */
-    void (GLAPIENTRYP CallList) (GLuint list);  /* 2 */
-    void (GLAPIENTRYP CallLists) (GLsizei n, GLenum type, const GLvoid * lists);        /* 3 */
-    void (GLAPIENTRYP DeleteLists) (GLuint list, GLsizei range);        /* 4 */
-     GLuint(GLAPIENTRYP GenLists) (GLsizei range);      /* 5 */
-    void (GLAPIENTRYP ListBase) (GLuint base);  /* 6 */
-    void (GLAPIENTRYP Begin) (GLenum mode);     /* 7 */
-    void (GLAPIENTRYP Bitmap) (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte * bitmap);      /* 8 */
-    void (GLAPIENTRYP Color3b) (GLbyte red, GLbyte green, GLbyte blue); /* 9 */
-    void (GLAPIENTRYP Color3bv) (const GLbyte * v);     /* 10 */
-    void (GLAPIENTRYP Color3d) (GLdouble red, GLdouble green, GLdouble blue);   /* 11 */
-    void (GLAPIENTRYP Color3dv) (const GLdouble * v);   /* 12 */
-    void (GLAPIENTRYP Color3f) (GLfloat red, GLfloat green, GLfloat blue);      /* 13 */
-    void (GLAPIENTRYP Color3fv) (const GLfloat * v);    /* 14 */
-    void (GLAPIENTRYP Color3i) (GLint red, GLint green, GLint blue);    /* 15 */
-    void (GLAPIENTRYP Color3iv) (const GLint * v);      /* 16 */
-    void (GLAPIENTRYP Color3s) (GLshort red, GLshort green, GLshort blue);      /* 17 */
-    void (GLAPIENTRYP Color3sv) (const GLshort * v);    /* 18 */
-    void (GLAPIENTRYP Color3ub) (GLubyte red, GLubyte green, GLubyte blue);     /* 19 */
-    void (GLAPIENTRYP Color3ubv) (const GLubyte * v);   /* 20 */
-    void (GLAPIENTRYP Color3ui) (GLuint red, GLuint green, GLuint blue);        /* 21 */
-    void (GLAPIENTRYP Color3uiv) (const GLuint * v);    /* 22 */
-    void (GLAPIENTRYP Color3us) (GLushort red, GLushort green, GLushort blue);  /* 23 */
-    void (GLAPIENTRYP Color3usv) (const GLushort * v);  /* 24 */
-    void (GLAPIENTRYP Color4b) (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);   /* 25 */
-    void (GLAPIENTRYP Color4bv) (const GLbyte * v);     /* 26 */
-    void (GLAPIENTRYP Color4d) (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);   /* 27 */
-    void (GLAPIENTRYP Color4dv) (const GLdouble * v);   /* 28 */
-    void (GLAPIENTRYP Color4f) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);       /* 29 */
-    void (GLAPIENTRYP Color4fv) (const GLfloat * v);    /* 30 */
-    void (GLAPIENTRYP Color4i) (GLint red, GLint green, GLint blue, GLint alpha);       /* 31 */
-    void (GLAPIENTRYP Color4iv) (const GLint * v);      /* 32 */
-    void (GLAPIENTRYP Color4s) (GLshort red, GLshort green, GLshort blue, GLshort alpha);       /* 33 */
-    void (GLAPIENTRYP Color4sv) (const GLshort * v);    /* 34 */
-    void (GLAPIENTRYP Color4ub) (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);      /* 35 */
-    void (GLAPIENTRYP Color4ubv) (const GLubyte * v);   /* 36 */
-    void (GLAPIENTRYP Color4ui) (GLuint red, GLuint green, GLuint blue, GLuint alpha);  /* 37 */
-    void (GLAPIENTRYP Color4uiv) (const GLuint * v);    /* 38 */
-    void (GLAPIENTRYP Color4us) (GLushort red, GLushort green, GLushort blue, GLushort alpha);  /* 39 */
-    void (GLAPIENTRYP Color4usv) (const GLushort * v);  /* 40 */
-    void (GLAPIENTRYP EdgeFlag) (GLboolean flag);       /* 41 */
-    void (GLAPIENTRYP EdgeFlagv) (const GLboolean * flag);      /* 42 */
-    void (GLAPIENTRYP End) (void);      /* 43 */
-    void (GLAPIENTRYP Indexd) (GLdouble c);     /* 44 */
-    void (GLAPIENTRYP Indexdv) (const GLdouble * c);    /* 45 */
-    void (GLAPIENTRYP Indexf) (GLfloat c);      /* 46 */
-    void (GLAPIENTRYP Indexfv) (const GLfloat * c);     /* 47 */
-    void (GLAPIENTRYP Indexi) (GLint c);        /* 48 */
-    void (GLAPIENTRYP Indexiv) (const GLint * c);       /* 49 */
-    void (GLAPIENTRYP Indexs) (GLshort c);      /* 50 */
-    void (GLAPIENTRYP Indexsv) (const GLshort * c);     /* 51 */
-    void (GLAPIENTRYP Normal3b) (GLbyte nx, GLbyte ny, GLbyte nz);      /* 52 */
-    void (GLAPIENTRYP Normal3bv) (const GLbyte * v);    /* 53 */
-    void (GLAPIENTRYP Normal3d) (GLdouble nx, GLdouble ny, GLdouble nz);        /* 54 */
-    void (GLAPIENTRYP Normal3dv) (const GLdouble * v);  /* 55 */
-    void (GLAPIENTRYP Normal3f) (GLfloat nx, GLfloat ny, GLfloat nz);   /* 56 */
-    void (GLAPIENTRYP Normal3fv) (const GLfloat * v);   /* 57 */
-    void (GLAPIENTRYP Normal3i) (GLint nx, GLint ny, GLint nz); /* 58 */
-    void (GLAPIENTRYP Normal3iv) (const GLint * v);     /* 59 */
-    void (GLAPIENTRYP Normal3s) (GLshort nx, GLshort ny, GLshort nz);   /* 60 */
-    void (GLAPIENTRYP Normal3sv) (const GLshort * v);   /* 61 */
-    void (GLAPIENTRYP RasterPos2d) (GLdouble x, GLdouble y);    /* 62 */
-    void (GLAPIENTRYP RasterPos2dv) (const GLdouble * v);       /* 63 */
-    void (GLAPIENTRYP RasterPos2f) (GLfloat x, GLfloat y);      /* 64 */
-    void (GLAPIENTRYP RasterPos2fv) (const GLfloat * v);        /* 65 */
-    void (GLAPIENTRYP RasterPos2i) (GLint x, GLint y);  /* 66 */
-    void (GLAPIENTRYP RasterPos2iv) (const GLint * v);  /* 67 */
-    void (GLAPIENTRYP RasterPos2s) (GLshort x, GLshort y);      /* 68 */
-    void (GLAPIENTRYP RasterPos2sv) (const GLshort * v);        /* 69 */
-    void (GLAPIENTRYP RasterPos3d) (GLdouble x, GLdouble y, GLdouble z);        /* 70 */
-    void (GLAPIENTRYP RasterPos3dv) (const GLdouble * v);       /* 71 */
-    void (GLAPIENTRYP RasterPos3f) (GLfloat x, GLfloat y, GLfloat z);   /* 72 */
-    void (GLAPIENTRYP RasterPos3fv) (const GLfloat * v);        /* 73 */
-    void (GLAPIENTRYP RasterPos3i) (GLint x, GLint y, GLint z); /* 74 */
-    void (GLAPIENTRYP RasterPos3iv) (const GLint * v);  /* 75 */
-    void (GLAPIENTRYP RasterPos3s) (GLshort x, GLshort y, GLshort z);   /* 76 */
-    void (GLAPIENTRYP RasterPos3sv) (const GLshort * v);        /* 77 */
-    void (GLAPIENTRYP RasterPos4d) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);    /* 78 */
-    void (GLAPIENTRYP RasterPos4dv) (const GLdouble * v);       /* 79 */
-    void (GLAPIENTRYP RasterPos4f) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);        /* 80 */
-    void (GLAPIENTRYP RasterPos4fv) (const GLfloat * v);        /* 81 */
-    void (GLAPIENTRYP RasterPos4i) (GLint x, GLint y, GLint z, GLint w);        /* 82 */
-    void (GLAPIENTRYP RasterPos4iv) (const GLint * v);  /* 83 */
-    void (GLAPIENTRYP RasterPos4s) (GLshort x, GLshort y, GLshort z, GLshort w);        /* 84 */
-    void (GLAPIENTRYP RasterPos4sv) (const GLshort * v);        /* 85 */
-    void (GLAPIENTRYP Rectd) (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);      /* 86 */
-    void (GLAPIENTRYP Rectdv) (const GLdouble * v1, const GLdouble * v2);       /* 87 */
-    void (GLAPIENTRYP Rectf) (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);  /* 88 */
-    void (GLAPIENTRYP Rectfv) (const GLfloat * v1, const GLfloat * v2); /* 89 */
-    void (GLAPIENTRYP Recti) (GLint x1, GLint y1, GLint x2, GLint y2);  /* 90 */
-    void (GLAPIENTRYP Rectiv) (const GLint * v1, const GLint * v2);     /* 91 */
-    void (GLAPIENTRYP Rects) (GLshort x1, GLshort y1, GLshort x2, GLshort y2);  /* 92 */
-    void (GLAPIENTRYP Rectsv) (const GLshort * v1, const GLshort * v2); /* 93 */
-    void (GLAPIENTRYP TexCoord1d) (GLdouble s); /* 94 */
-    void (GLAPIENTRYP TexCoord1dv) (const GLdouble * v);        /* 95 */
-    void (GLAPIENTRYP TexCoord1f) (GLfloat s);  /* 96 */
-    void (GLAPIENTRYP TexCoord1fv) (const GLfloat * v); /* 97 */
-    void (GLAPIENTRYP TexCoord1i) (GLint s);    /* 98 */
-    void (GLAPIENTRYP TexCoord1iv) (const GLint * v);   /* 99 */
-    void (GLAPIENTRYP TexCoord1s) (GLshort s);  /* 100 */
-    void (GLAPIENTRYP TexCoord1sv) (const GLshort * v); /* 101 */
-    void (GLAPIENTRYP TexCoord2d) (GLdouble s, GLdouble t);     /* 102 */
-    void (GLAPIENTRYP TexCoord2dv) (const GLdouble * v);        /* 103 */
-    void (GLAPIENTRYP TexCoord2f) (GLfloat s, GLfloat t);       /* 104 */
-    void (GLAPIENTRYP TexCoord2fv) (const GLfloat * v); /* 105 */
-    void (GLAPIENTRYP TexCoord2i) (GLint s, GLint t);   /* 106 */
-    void (GLAPIENTRYP TexCoord2iv) (const GLint * v);   /* 107 */
-    void (GLAPIENTRYP TexCoord2s) (GLshort s, GLshort t);       /* 108 */
-    void (GLAPIENTRYP TexCoord2sv) (const GLshort * v); /* 109 */
-    void (GLAPIENTRYP TexCoord3d) (GLdouble s, GLdouble t, GLdouble r); /* 110 */
-    void (GLAPIENTRYP TexCoord3dv) (const GLdouble * v);        /* 111 */
-    void (GLAPIENTRYP TexCoord3f) (GLfloat s, GLfloat t, GLfloat r);    /* 112 */
-    void (GLAPIENTRYP TexCoord3fv) (const GLfloat * v); /* 113 */
-    void (GLAPIENTRYP TexCoord3i) (GLint s, GLint t, GLint r);  /* 114 */
-    void (GLAPIENTRYP TexCoord3iv) (const GLint * v);   /* 115 */
-    void (GLAPIENTRYP TexCoord3s) (GLshort s, GLshort t, GLshort r);    /* 116 */
-    void (GLAPIENTRYP TexCoord3sv) (const GLshort * v); /* 117 */
-    void (GLAPIENTRYP TexCoord4d) (GLdouble s, GLdouble t, GLdouble r, GLdouble q);     /* 118 */
-    void (GLAPIENTRYP TexCoord4dv) (const GLdouble * v);        /* 119 */
-    void (GLAPIENTRYP TexCoord4f) (GLfloat s, GLfloat t, GLfloat r, GLfloat q); /* 120 */
-    void (GLAPIENTRYP TexCoord4fv) (const GLfloat * v); /* 121 */
-    void (GLAPIENTRYP TexCoord4i) (GLint s, GLint t, GLint r, GLint q); /* 122 */
-    void (GLAPIENTRYP TexCoord4iv) (const GLint * v);   /* 123 */
-    void (GLAPIENTRYP TexCoord4s) (GLshort s, GLshort t, GLshort r, GLshort q); /* 124 */
-    void (GLAPIENTRYP TexCoord4sv) (const GLshort * v); /* 125 */
-    void (GLAPIENTRYP Vertex2d) (GLdouble x, GLdouble y);       /* 126 */
-    void (GLAPIENTRYP Vertex2dv) (const GLdouble * v);  /* 127 */
-    void (GLAPIENTRYP Vertex2f) (GLfloat x, GLfloat y); /* 128 */
-    void (GLAPIENTRYP Vertex2fv) (const GLfloat * v);   /* 129 */
-    void (GLAPIENTRYP Vertex2i) (GLint x, GLint y);     /* 130 */
-    void (GLAPIENTRYP Vertex2iv) (const GLint * v);     /* 131 */
-    void (GLAPIENTRYP Vertex2s) (GLshort x, GLshort y); /* 132 */
-    void (GLAPIENTRYP Vertex2sv) (const GLshort * v);   /* 133 */
-    void (GLAPIENTRYP Vertex3d) (GLdouble x, GLdouble y, GLdouble z);   /* 134 */
-    void (GLAPIENTRYP Vertex3dv) (const GLdouble * v);  /* 135 */
-    void (GLAPIENTRYP Vertex3f) (GLfloat x, GLfloat y, GLfloat z);      /* 136 */
-    void (GLAPIENTRYP Vertex3fv) (const GLfloat * v);   /* 137 */
-    void (GLAPIENTRYP Vertex3i) (GLint x, GLint y, GLint z);    /* 138 */
-    void (GLAPIENTRYP Vertex3iv) (const GLint * v);     /* 139 */
-    void (GLAPIENTRYP Vertex3s) (GLshort x, GLshort y, GLshort z);      /* 140 */
-    void (GLAPIENTRYP Vertex3sv) (const GLshort * v);   /* 141 */
-    void (GLAPIENTRYP Vertex4d) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);       /* 142 */
-    void (GLAPIENTRYP Vertex4dv) (const GLdouble * v);  /* 143 */
-    void (GLAPIENTRYP Vertex4f) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);   /* 144 */
-    void (GLAPIENTRYP Vertex4fv) (const GLfloat * v);   /* 145 */
-    void (GLAPIENTRYP Vertex4i) (GLint x, GLint y, GLint z, GLint w);   /* 146 */
-    void (GLAPIENTRYP Vertex4iv) (const GLint * v);     /* 147 */
-    void (GLAPIENTRYP Vertex4s) (GLshort x, GLshort y, GLshort z, GLshort w);   /* 148 */
-    void (GLAPIENTRYP Vertex4sv) (const GLshort * v);   /* 149 */
-    void (GLAPIENTRYP ClipPlane) (GLenum plane, const GLdouble * equation);     /* 150 */
-    void (GLAPIENTRYP ColorMaterial) (GLenum face, GLenum mode);        /* 151 */
-    void (GLAPIENTRYP CullFace) (GLenum mode);  /* 152 */
-    void (GLAPIENTRYP Fogf) (GLenum pname, GLfloat param);      /* 153 */
-    void (GLAPIENTRYP Fogfv) (GLenum pname, const GLfloat * params);    /* 154 */
-    void (GLAPIENTRYP Fogi) (GLenum pname, GLint param);        /* 155 */
-    void (GLAPIENTRYP Fogiv) (GLenum pname, const GLint * params);      /* 156 */
-    void (GLAPIENTRYP FrontFace) (GLenum mode); /* 157 */
-    void (GLAPIENTRYP Hint) (GLenum target, GLenum mode);       /* 158 */
-    void (GLAPIENTRYP Lightf) (GLenum light, GLenum pname, GLfloat param);      /* 159 */
-    void (GLAPIENTRYP Lightfv) (GLenum light, GLenum pname, const GLfloat * params);    /* 160 */
-    void (GLAPIENTRYP Lighti) (GLenum light, GLenum pname, GLint param);        /* 161 */
-    void (GLAPIENTRYP Lightiv) (GLenum light, GLenum pname, const GLint * params);      /* 162 */
-    void (GLAPIENTRYP LightModelf) (GLenum pname, GLfloat param);       /* 163 */
-    void (GLAPIENTRYP LightModelfv) (GLenum pname, const GLfloat * params);     /* 164 */
-    void (GLAPIENTRYP LightModeli) (GLenum pname, GLint param); /* 165 */
-    void (GLAPIENTRYP LightModeliv) (GLenum pname, const GLint * params);       /* 166 */
-    void (GLAPIENTRYP LineStipple) (GLint factor, GLushort pattern);    /* 167 */
-    void (GLAPIENTRYP LineWidth) (GLfloat width);       /* 168 */
-    void (GLAPIENTRYP Materialf) (GLenum face, GLenum pname, GLfloat param);    /* 169 */
-    void (GLAPIENTRYP Materialfv) (GLenum face, GLenum pname, const GLfloat * params);  /* 170 */
-    void (GLAPIENTRYP Materiali) (GLenum face, GLenum pname, GLint param);      /* 171 */
-    void (GLAPIENTRYP Materialiv) (GLenum face, GLenum pname, const GLint * params);    /* 172 */
-    void (GLAPIENTRYP PointSize) (GLfloat size);        /* 173 */
-    void (GLAPIENTRYP PolygonMode) (GLenum face, GLenum mode);  /* 174 */
-    void (GLAPIENTRYP PolygonStipple) (const GLubyte * mask);   /* 175 */
-    void (GLAPIENTRYP Scissor) (GLint x, GLint y, GLsizei width, GLsizei height);       /* 176 */
-    void (GLAPIENTRYP ShadeModel) (GLenum mode);        /* 177 */
-    void (GLAPIENTRYP TexParameterf) (GLenum target, GLenum pname, GLfloat param);      /* 178 */
-    void (GLAPIENTRYP TexParameterfv) (GLenum target, GLenum pname, const GLfloat * params);    /* 179 */
-    void (GLAPIENTRYP TexParameteri) (GLenum target, GLenum pname, GLint param);        /* 180 */
-    void (GLAPIENTRYP TexParameteriv) (GLenum target, GLenum pname, const GLint * params);      /* 181 */
-    void (GLAPIENTRYP TexImage1D) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels);   /* 182 */
-    void (GLAPIENTRYP TexImage2D) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels);   /* 183 */
-    void (GLAPIENTRYP TexEnvf) (GLenum target, GLenum pname, GLfloat param);    /* 184 */
-    void (GLAPIENTRYP TexEnvfv) (GLenum target, GLenum pname, const GLfloat * params);  /* 185 */
-    void (GLAPIENTRYP TexEnvi) (GLenum target, GLenum pname, GLint param);      /* 186 */
-    void (GLAPIENTRYP TexEnviv) (GLenum target, GLenum pname, const GLint * params);    /* 187 */
-    void (GLAPIENTRYP TexGend) (GLenum coord, GLenum pname, GLdouble param);    /* 188 */
-    void (GLAPIENTRYP TexGendv) (GLenum coord, GLenum pname, const GLdouble * params);  /* 189 */
-    void (GLAPIENTRYP TexGenf) (GLenum coord, GLenum pname, GLfloat param);     /* 190 */
-    void (GLAPIENTRYP TexGenfv) (GLenum coord, GLenum pname, const GLfloat * params);   /* 191 */
-    void (GLAPIENTRYP TexGeni) (GLenum coord, GLenum pname, GLint param);       /* 192 */
-    void (GLAPIENTRYP TexGeniv) (GLenum coord, GLenum pname, const GLint * params);     /* 193 */
-    void (GLAPIENTRYP FeedbackBuffer) (GLsizei size, GLenum type, GLfloat * buffer);    /* 194 */
-    void (GLAPIENTRYP SelectBuffer) (GLsizei size, GLuint * buffer);    /* 195 */
-     GLint(GLAPIENTRYP RenderMode) (GLenum mode);       /* 196 */
-    void (GLAPIENTRYP InitNames) (void);        /* 197 */
-    void (GLAPIENTRYP LoadName) (GLuint name);  /* 198 */
-    void (GLAPIENTRYP PassThrough) (GLfloat token);     /* 199 */
-    void (GLAPIENTRYP PopName) (void);  /* 200 */
-    void (GLAPIENTRYP PushName) (GLuint name);  /* 201 */
-    void (GLAPIENTRYP DrawBuffer) (GLenum mode);        /* 202 */
-    void (GLAPIENTRYP Clear) (GLbitfield mask); /* 203 */
-    void (GLAPIENTRYP ClearAccum) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);    /* 204 */
-    void (GLAPIENTRYP ClearIndex) (GLfloat c);  /* 205 */
-    void (GLAPIENTRYP ClearColor) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);        /* 206 */
-    void (GLAPIENTRYP ClearStencil) (GLint s);  /* 207 */
-    void (GLAPIENTRYP ClearDepth) (GLclampd depth);     /* 208 */
-    void (GLAPIENTRYP StencilMask) (GLuint mask);       /* 209 */
-    void (GLAPIENTRYP ColorMask) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);     /* 210 */
-    void (GLAPIENTRYP DepthMask) (GLboolean flag);      /* 211 */
-    void (GLAPIENTRYP IndexMask) (GLuint mask); /* 212 */
-    void (GLAPIENTRYP Accum) (GLenum op, GLfloat value);        /* 213 */
-    void (GLAPIENTRYP Disable) (GLenum cap);    /* 214 */
-    void (GLAPIENTRYP Enable) (GLenum cap);     /* 215 */
-    void (GLAPIENTRYP Finish) (void);   /* 216 */
-    void (GLAPIENTRYP Flush) (void);    /* 217 */
-    void (GLAPIENTRYP PopAttrib) (void);        /* 218 */
-    void (GLAPIENTRYP PushAttrib) (GLbitfield mask);    /* 219 */
-    void (GLAPIENTRYP Map1d) (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points);     /* 220 */
-    void (GLAPIENTRYP Map1f) (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat * points);        /* 221 */
-    void (GLAPIENTRYP Map2d) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble * points);    /* 222 */
-    void (GLAPIENTRYP Map2f) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat * points); /* 223 */
-    void (GLAPIENTRYP MapGrid1d) (GLint un, GLdouble u1, GLdouble u2);  /* 224 */
-    void (GLAPIENTRYP MapGrid1f) (GLint un, GLfloat u1, GLfloat u2);    /* 225 */
-    void (GLAPIENTRYP MapGrid2d) (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);      /* 226 */
-    void (GLAPIENTRYP MapGrid2f) (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);  /* 227 */
-    void (GLAPIENTRYP EvalCoord1d) (GLdouble u);        /* 228 */
-    void (GLAPIENTRYP EvalCoord1dv) (const GLdouble * u);       /* 229 */
-    void (GLAPIENTRYP EvalCoord1f) (GLfloat u); /* 230 */
-    void (GLAPIENTRYP EvalCoord1fv) (const GLfloat * u);        /* 231 */
-    void (GLAPIENTRYP EvalCoord2d) (GLdouble u, GLdouble v);    /* 232 */
-    void (GLAPIENTRYP EvalCoord2dv) (const GLdouble * u);       /* 233 */
-    void (GLAPIENTRYP EvalCoord2f) (GLfloat u, GLfloat v);      /* 234 */
-    void (GLAPIENTRYP EvalCoord2fv) (const GLfloat * u);        /* 235 */
-    void (GLAPIENTRYP EvalMesh1) (GLenum mode, GLint i1, GLint i2);     /* 236 */
-    void (GLAPIENTRYP EvalPoint1) (GLint i);    /* 237 */
-    void (GLAPIENTRYP EvalMesh2) (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); /* 238 */
-    void (GLAPIENTRYP EvalPoint2) (GLint i, GLint j);   /* 239 */
-    void (GLAPIENTRYP AlphaFunc) (GLenum func, GLclampf ref);   /* 240 */
-    void (GLAPIENTRYP BlendFunc) (GLenum sfactor, GLenum dfactor);      /* 241 */
-    void (GLAPIENTRYP LogicOp) (GLenum opcode); /* 242 */
-    void (GLAPIENTRYP StencilFunc) (GLenum func, GLint ref, GLuint mask);       /* 243 */
-    void (GLAPIENTRYP StencilOp) (GLenum fail, GLenum zfail, GLenum zpass);     /* 244 */
-    void (GLAPIENTRYP DepthFunc) (GLenum func); /* 245 */
-    void (GLAPIENTRYP PixelZoom) (GLfloat xfactor, GLfloat yfactor);    /* 246 */
-    void (GLAPIENTRYP PixelTransferf) (GLenum pname, GLfloat param);    /* 247 */
-    void (GLAPIENTRYP PixelTransferi) (GLenum pname, GLint param);      /* 248 */
-    void (GLAPIENTRYP PixelStoref) (GLenum pname, GLfloat param);       /* 249 */
-    void (GLAPIENTRYP PixelStorei) (GLenum pname, GLint param); /* 250 */
-    void (GLAPIENTRYP PixelMapfv) (GLenum map, GLsizei mapsize, const GLfloat * values);        /* 251 */
-    void (GLAPIENTRYP PixelMapuiv) (GLenum map, GLsizei mapsize, const GLuint * values);        /* 252 */
-    void (GLAPIENTRYP PixelMapusv) (GLenum map, GLsizei mapsize, const GLushort * values);      /* 253 */
-    void (GLAPIENTRYP ReadBuffer) (GLenum mode);        /* 254 */
-    void (GLAPIENTRYP CopyPixels) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);       /* 255 */
-    void (GLAPIENTRYP ReadPixels) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels);       /* 256 */
-    void (GLAPIENTRYP DrawPixels) (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels);   /* 257 */
-    void (GLAPIENTRYP GetBooleanv) (GLenum pname, GLboolean * params);  /* 258 */
-    void (GLAPIENTRYP GetClipPlane) (GLenum plane, GLdouble * equation);        /* 259 */
-    void (GLAPIENTRYP GetDoublev) (GLenum pname, GLdouble * params);    /* 260 */
-     GLenum(GLAPIENTRYP GetError) (void);       /* 261 */
-    void (GLAPIENTRYP GetFloatv) (GLenum pname, GLfloat * params);      /* 262 */
-    void (GLAPIENTRYP GetIntegerv) (GLenum pname, GLint * params);      /* 263 */
-    void (GLAPIENTRYP GetLightfv) (GLenum light, GLenum pname, GLfloat * params);       /* 264 */
-    void (GLAPIENTRYP GetLightiv) (GLenum light, GLenum pname, GLint * params); /* 265 */
-    void (GLAPIENTRYP GetMapdv) (GLenum target, GLenum query, GLdouble * v);    /* 266 */
-    void (GLAPIENTRYP GetMapfv) (GLenum target, GLenum query, GLfloat * v);     /* 267 */
-    void (GLAPIENTRYP GetMapiv) (GLenum target, GLenum query, GLint * v);       /* 268 */
-    void (GLAPIENTRYP GetMaterialfv) (GLenum face, GLenum pname, GLfloat * params);     /* 269 */
-    void (GLAPIENTRYP GetMaterialiv) (GLenum face, GLenum pname, GLint * params);       /* 270 */
-    void (GLAPIENTRYP GetPixelMapfv) (GLenum map, GLfloat * values);    /* 271 */
-    void (GLAPIENTRYP GetPixelMapuiv) (GLenum map, GLuint * values);    /* 272 */
-    void (GLAPIENTRYP GetPixelMapusv) (GLenum map, GLushort * values);  /* 273 */
-    void (GLAPIENTRYP GetPolygonStipple) (GLubyte * mask);      /* 274 */
-    const GLubyte *(GLAPIENTRYP GetString) (GLenum name);       /* 275 */
-    void (GLAPIENTRYP GetTexEnvfv) (GLenum target, GLenum pname, GLfloat * params);     /* 276 */
-    void (GLAPIENTRYP GetTexEnviv) (GLenum target, GLenum pname, GLint * params);       /* 277 */
-    void (GLAPIENTRYP GetTexGendv) (GLenum coord, GLenum pname, GLdouble * params);     /* 278 */
-    void (GLAPIENTRYP GetTexGenfv) (GLenum coord, GLenum pname, GLfloat * params);      /* 279 */
-    void (GLAPIENTRYP GetTexGeniv) (GLenum coord, GLenum pname, GLint * params);        /* 280 */
-    void (GLAPIENTRYP GetTexImage) (GLenum target, GLint level, GLenum format, GLenum type, GLvoid * pixels);   /* 281 */
-    void (GLAPIENTRYP GetTexParameterfv) (GLenum target, GLenum pname, GLfloat * params);       /* 282 */
-    void (GLAPIENTRYP GetTexParameteriv) (GLenum target, GLenum pname, GLint * params); /* 283 */
-    void (GLAPIENTRYP GetTexLevelParameterfv) (GLenum target, GLint level, GLenum pname, GLfloat * params);     /* 284 */
-    void (GLAPIENTRYP GetTexLevelParameteriv) (GLenum target, GLint level, GLenum pname, GLint * params);       /* 285 */
-     GLboolean(GLAPIENTRYP IsEnabled) (GLenum cap);     /* 286 */
-     GLboolean(GLAPIENTRYP IsList) (GLuint list);       /* 287 */
-    void (GLAPIENTRYP DepthRange) (GLclampd zNear, GLclampd zFar);      /* 288 */
-    void (GLAPIENTRYP Frustum) (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);   /* 289 */
-    void (GLAPIENTRYP LoadIdentity) (void);     /* 290 */
-    void (GLAPIENTRYP LoadMatrixf) (const GLfloat * m); /* 291 */
-    void (GLAPIENTRYP LoadMatrixd) (const GLdouble * m);        /* 292 */
-    void (GLAPIENTRYP MatrixMode) (GLenum mode);        /* 293 */
-    void (GLAPIENTRYP MultMatrixf) (const GLfloat * m); /* 294 */
-    void (GLAPIENTRYP MultMatrixd) (const GLdouble * m);        /* 295 */
-    void (GLAPIENTRYP Ortho) (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);     /* 296 */
-    void (GLAPIENTRYP PopMatrix) (void);        /* 297 */
-    void (GLAPIENTRYP PushMatrix) (void);       /* 298 */
-    void (GLAPIENTRYP Rotated) (GLdouble angle, GLdouble x, GLdouble y, GLdouble z);    /* 299 */
-    void (GLAPIENTRYP Rotatef) (GLfloat angle, GLfloat x, GLfloat y, GLfloat z);        /* 300 */
-    void (GLAPIENTRYP Scaled) (GLdouble x, GLdouble y, GLdouble z);     /* 301 */
-    void (GLAPIENTRYP Scalef) (GLfloat x, GLfloat y, GLfloat z);        /* 302 */
-    void (GLAPIENTRYP Translated) (GLdouble x, GLdouble y, GLdouble z); /* 303 */
-    void (GLAPIENTRYP Translatef) (GLfloat x, GLfloat y, GLfloat z);    /* 304 */
-    void (GLAPIENTRYP Viewport) (GLint x, GLint y, GLsizei width, GLsizei height);      /* 305 */
-    void (GLAPIENTRYP ArrayElement) (GLint i);  /* 306 */
-    void (GLAPIENTRYP BindTexture) (GLenum target, GLuint texture);     /* 307 */
-    void (GLAPIENTRYP ColorPointer) (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer);  /* 308 */
-    void (GLAPIENTRYP DisableClientState) (GLenum array);       /* 309 */
-    void (GLAPIENTRYP DrawArrays) (GLenum mode, GLint first, GLsizei count);    /* 310 */
-    void (GLAPIENTRYP DrawElements) (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices);  /* 311 */
-    void (GLAPIENTRYP EdgeFlagPointer) (GLsizei stride, const GLvoid * pointer);        /* 312 */
-    void (GLAPIENTRYP EnableClientState) (GLenum array);        /* 313 */
-    void (GLAPIENTRYP IndexPointer) (GLenum type, GLsizei stride, const GLvoid * pointer);      /* 314 */
-    void (GLAPIENTRYP Indexub) (GLubyte c);     /* 315 */
-    void (GLAPIENTRYP Indexubv) (const GLubyte * c);    /* 316 */
-    void (GLAPIENTRYP InterleavedArrays) (GLenum format, GLsizei stride, const GLvoid * pointer);       /* 317 */
-    void (GLAPIENTRYP NormalPointer) (GLenum type, GLsizei stride, const GLvoid * pointer);     /* 318 */
-    void (GLAPIENTRYP PolygonOffset) (GLfloat factor, GLfloat units);   /* 319 */
-    void (GLAPIENTRYP TexCoordPointer) (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer);       /* 320 */
-    void (GLAPIENTRYP VertexPointer) (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 321 */
-     GLboolean(GLAPIENTRYP AreTexturesResident) (GLsizei n, const GLuint * textures, GLboolean * residences);   /* 322 */
-    void (GLAPIENTRYP CopyTexImage1D) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);       /* 323 */
-    void (GLAPIENTRYP CopyTexImage2D) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);       /* 324 */
-    void (GLAPIENTRYP CopyTexSubImage1D) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);  /* 325 */
-    void (GLAPIENTRYP CopyTexSubImage2D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);   /* 326 */
-    void (GLAPIENTRYP DeleteTextures) (GLsizei n, const GLuint * textures);     /* 327 */
-    void (GLAPIENTRYP GenTextures) (GLsizei n, GLuint * textures);      /* 328 */
-    void (GLAPIENTRYP GetPointerv) (GLenum pname, GLvoid ** params);    /* 329 */
-     GLboolean(GLAPIENTRYP IsTexture) (GLuint texture); /* 330 */
-    void (GLAPIENTRYP PrioritizeTextures) (GLsizei n, const GLuint * textures, const GLclampf * priorities);    /* 331 */
-    void (GLAPIENTRYP TexSubImage1D) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels);     /* 332 */
-    void (GLAPIENTRYP TexSubImage2D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels);      /* 333 */
-    void (GLAPIENTRYP PopClientAttrib) (void);  /* 334 */
-    void (GLAPIENTRYP PushClientAttrib) (GLbitfield mask);      /* 335 */
-    void (GLAPIENTRYP BlendColor) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);        /* 336 */
-    void (GLAPIENTRYP BlendEquation) (GLenum mode);     /* 337 */
-    void (GLAPIENTRYP DrawRangeElements) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices);   /* 338 */
-    void (GLAPIENTRYP ColorTable) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * table);      /* 339 */
-    void (GLAPIENTRYP ColorTableParameterfv) (GLenum target, GLenum pname, const GLfloat * params);     /* 340 */
-    void (GLAPIENTRYP ColorTableParameteriv) (GLenum target, GLenum pname, const GLint * params);       /* 341 */
-    void (GLAPIENTRYP CopyColorTable) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);  /* 342 */
-    void (GLAPIENTRYP GetColorTable) (GLenum target, GLenum format, GLenum type, GLvoid * table);       /* 343 */
-    void (GLAPIENTRYP GetColorTableParameterfv) (GLenum target, GLenum pname, GLfloat * params);        /* 344 */
-    void (GLAPIENTRYP GetColorTableParameteriv) (GLenum target, GLenum pname, GLint * params);  /* 345 */
-    void (GLAPIENTRYP ColorSubTable) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid * data);    /* 346 */
-    void (GLAPIENTRYP CopyColorSubTable) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);       /* 347 */
-    void (GLAPIENTRYP ConvolutionFilter1D) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * image);     /* 348 */
-    void (GLAPIENTRYP ConvolutionFilter2D) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * image);     /* 349 */
-    void (GLAPIENTRYP ConvolutionParameterf) (GLenum target, GLenum pname, GLfloat params);     /* 350 */
-    void (GLAPIENTRYP ConvolutionParameterfv) (GLenum target, GLenum pname, const GLfloat * params);    /* 351 */
-    void (GLAPIENTRYP ConvolutionParameteri) (GLenum target, GLenum pname, GLint params);       /* 352 */
-    void (GLAPIENTRYP ConvolutionParameteriv) (GLenum target, GLenum pname, const GLint * params);      /* 353 */
-    void (GLAPIENTRYP CopyConvolutionFilter1D) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); /* 354 */
-    void (GLAPIENTRYP CopyConvolutionFilter2D) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); /* 355 */
-    void (GLAPIENTRYP GetConvolutionFilter) (GLenum target, GLenum format, GLenum type, GLvoid * image);        /* 356 */
-    void (GLAPIENTRYP GetConvolutionParameterfv) (GLenum target, GLenum pname, GLfloat * params);       /* 357 */
-    void (GLAPIENTRYP GetConvolutionParameteriv) (GLenum target, GLenum pname, GLint * params); /* 358 */
-    void (GLAPIENTRYP GetSeparableFilter) (GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span);    /* 359 */
-    void (GLAPIENTRYP SeparableFilter2D) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * row, const GLvoid * column);  /* 360 */
-    void (GLAPIENTRYP GetHistogram) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);      /* 361 */
-    void (GLAPIENTRYP GetHistogramParameterfv) (GLenum target, GLenum pname, GLfloat * params); /* 362 */
-    void (GLAPIENTRYP GetHistogramParameteriv) (GLenum target, GLenum pname, GLint * params);   /* 363 */
-    void (GLAPIENTRYP GetMinmax) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); /* 364 */
-    void (GLAPIENTRYP GetMinmaxParameterfv) (GLenum target, GLenum pname, GLfloat * params);    /* 365 */
-    void (GLAPIENTRYP GetMinmaxParameteriv) (GLenum target, GLenum pname, GLint * params);      /* 366 */
-    void (GLAPIENTRYP Histogram) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); /* 367 */
-    void (GLAPIENTRYP Minmax) (GLenum target, GLenum internalformat, GLboolean sink);   /* 368 */
-    void (GLAPIENTRYP ResetHistogram) (GLenum target);  /* 369 */
-    void (GLAPIENTRYP ResetMinmax) (GLenum target);     /* 370 */
-    void (GLAPIENTRYP TexImage3D) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels);    /* 371 */
-    void (GLAPIENTRYP TexSubImage3D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels);        /* 372 */
-    void (GLAPIENTRYP CopyTexSubImage3D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);    /* 373 */
-    void (GLAPIENTRYP ActiveTextureARB) (GLenum texture);       /* 374 */
-    void (GLAPIENTRYP ClientActiveTextureARB) (GLenum texture); /* 375 */
-    void (GLAPIENTRYP MultiTexCoord1dARB) (GLenum target, GLdouble s);  /* 376 */
-    void (GLAPIENTRYP MultiTexCoord1dvARB) (GLenum target, const GLdouble * v); /* 377 */
-    void (GLAPIENTRYP MultiTexCoord1fARB) (GLenum target, GLfloat s);   /* 378 */
-    void (GLAPIENTRYP MultiTexCoord1fvARB) (GLenum target, const GLfloat * v);  /* 379 */
-    void (GLAPIENTRYP MultiTexCoord1iARB) (GLenum target, GLint s);     /* 380 */
-    void (GLAPIENTRYP MultiTexCoord1ivARB) (GLenum target, const GLint * v);    /* 381 */
-    void (GLAPIENTRYP MultiTexCoord1sARB) (GLenum target, GLshort s);   /* 382 */
-    void (GLAPIENTRYP MultiTexCoord1svARB) (GLenum target, const GLshort * v);  /* 383 */
-    void (GLAPIENTRYP MultiTexCoord2dARB) (GLenum target, GLdouble s, GLdouble t);      /* 384 */
-    void (GLAPIENTRYP MultiTexCoord2dvARB) (GLenum target, const GLdouble * v); /* 385 */
-    void (GLAPIENTRYP MultiTexCoord2fARB) (GLenum target, GLfloat s, GLfloat t);        /* 386 */
-    void (GLAPIENTRYP MultiTexCoord2fvARB) (GLenum target, const GLfloat * v);  /* 387 */
-    void (GLAPIENTRYP MultiTexCoord2iARB) (GLenum target, GLint s, GLint t);    /* 388 */
-    void (GLAPIENTRYP MultiTexCoord2ivARB) (GLenum target, const GLint * v);    /* 389 */
-    void (GLAPIENTRYP MultiTexCoord2sARB) (GLenum target, GLshort s, GLshort t);        /* 390 */
-    void (GLAPIENTRYP MultiTexCoord2svARB) (GLenum target, const GLshort * v);  /* 391 */
-    void (GLAPIENTRYP MultiTexCoord3dARB) (GLenum target, GLdouble s, GLdouble t, GLdouble r);  /* 392 */
-    void (GLAPIENTRYP MultiTexCoord3dvARB) (GLenum target, const GLdouble * v); /* 393 */
-    void (GLAPIENTRYP MultiTexCoord3fARB) (GLenum target, GLfloat s, GLfloat t, GLfloat r);     /* 394 */
-    void (GLAPIENTRYP MultiTexCoord3fvARB) (GLenum target, const GLfloat * v);  /* 395 */
-    void (GLAPIENTRYP MultiTexCoord3iARB) (GLenum target, GLint s, GLint t, GLint r);   /* 396 */
-    void (GLAPIENTRYP MultiTexCoord3ivARB) (GLenum target, const GLint * v);    /* 397 */
-    void (GLAPIENTRYP MultiTexCoord3sARB) (GLenum target, GLshort s, GLshort t, GLshort r);     /* 398 */
-    void (GLAPIENTRYP MultiTexCoord3svARB) (GLenum target, const GLshort * v);  /* 399 */
-    void (GLAPIENTRYP MultiTexCoord4dARB) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);      /* 400 */
-    void (GLAPIENTRYP MultiTexCoord4dvARB) (GLenum target, const GLdouble * v); /* 401 */
-    void (GLAPIENTRYP MultiTexCoord4fARB) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);  /* 402 */
-    void (GLAPIENTRYP MultiTexCoord4fvARB) (GLenum target, const GLfloat * v);  /* 403 */
-    void (GLAPIENTRYP MultiTexCoord4iARB) (GLenum target, GLint s, GLint t, GLint r, GLint q);  /* 404 */
-    void (GLAPIENTRYP MultiTexCoord4ivARB) (GLenum target, const GLint * v);    /* 405 */
-    void (GLAPIENTRYP MultiTexCoord4sARB) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);  /* 406 */
-    void (GLAPIENTRYP MultiTexCoord4svARB) (GLenum target, const GLshort * v);  /* 407 */
-    void (GLAPIENTRYP AttachShader) (GLuint program, GLuint shader);    /* 408 */
-     GLuint(GLAPIENTRYP CreateProgram) (void);  /* 409 */
-     GLuint(GLAPIENTRYP CreateShader) (GLenum type);    /* 410 */
-    void (GLAPIENTRYP DeleteProgram) (GLuint program);  /* 411 */
-    void (GLAPIENTRYP DeleteShader) (GLuint program);   /* 412 */
-    void (GLAPIENTRYP DetachShader) (GLuint program, GLuint shader);    /* 413 */
-    void (GLAPIENTRYP GetAttachedShaders) (GLuint program, GLsizei maxCount, GLsizei * count, GLuint * obj);    /* 414 */
-    void (GLAPIENTRYP GetProgramInfoLog) (GLuint program, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 415 */
-    void (GLAPIENTRYP GetProgramiv) (GLuint program, GLenum pname, GLint * params);     /* 416 */
-    void (GLAPIENTRYP GetShaderInfoLog) (GLuint shader, GLsizei bufSize, GLsizei * length, GLchar * infoLog);   /* 417 */
-    void (GLAPIENTRYP GetShaderiv) (GLuint shader, GLenum pname, GLint * params);       /* 418 */
-     GLboolean(GLAPIENTRYP IsProgram) (GLuint program); /* 419 */
-     GLboolean(GLAPIENTRYP IsShader) (GLuint shader);   /* 420 */
-    void (GLAPIENTRYP StencilFuncSeparate) (GLenum face, GLenum func, GLint ref, GLuint mask);  /* 421 */
-    void (GLAPIENTRYP StencilMaskSeparate) (GLenum face, GLuint mask);  /* 422 */
-    void (GLAPIENTRYP StencilOpSeparate) (GLenum face, GLenum sfail, GLenum zfail, GLenum zpass);       /* 423 */
-    void (GLAPIENTRYP UniformMatrix2x3fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);  /* 424 */
-    void (GLAPIENTRYP UniformMatrix2x4fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);  /* 425 */
-    void (GLAPIENTRYP UniformMatrix3x2fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);  /* 426 */
-    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 TexBuffer) (GLenum target, GLenum internalFormat, GLuint buffer); /* 436 */
-    void (GLAPIENTRYP FramebufferTexture) (GLenum target, GLenum attachment, GLuint texture, GLint level);      /* 437 */
-    void (GLAPIENTRYP GetBufferParameteri64v) (GLenum target, GLenum pname, GLint64 * params);  /* 438 */
-    void (GLAPIENTRYP GetInteger64i_v) (GLenum cap, GLuint index, GLint64 * data);      /* 439 */
-    void (GLAPIENTRYP VertexAttribDivisor) (GLuint index, GLuint divisor);      /* 440 */
-    void (GLAPIENTRYP LoadTransposeMatrixdARB) (const GLdouble * m);    /* 441 */
-    void (GLAPIENTRYP LoadTransposeMatrixfARB) (const GLfloat * m);     /* 442 */
-    void (GLAPIENTRYP MultTransposeMatrixdARB) (const GLdouble * m);    /* 443 */
-    void (GLAPIENTRYP MultTransposeMatrixfARB) (const GLfloat * m);     /* 444 */
-    void (GLAPIENTRYP SampleCoverageARB) (GLclampf value, GLboolean invert);    /* 445 */
-    void (GLAPIENTRYP CompressedTexImage1DARB) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data);        /* 446 */
-    void (GLAPIENTRYP CompressedTexImage2DARB) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data);        /* 447 */
-    void (GLAPIENTRYP CompressedTexImage3DARB) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); /* 448 */
-    void (GLAPIENTRYP CompressedTexSubImage1DARB) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data);    /* 449 */
-    void (GLAPIENTRYP CompressedTexSubImage2DARB) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data);     /* 450 */
-    void (GLAPIENTRYP CompressedTexSubImage3DARB) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data);       /* 451 */
-    void (GLAPIENTRYP GetCompressedTexImageARB) (GLenum target, GLint level, GLvoid * img);     /* 452 */
-    void (GLAPIENTRYP DisableVertexAttribArrayARB) (GLuint index);      /* 453 */
-    void (GLAPIENTRYP EnableVertexAttribArrayARB) (GLuint index);       /* 454 */
-    void (GLAPIENTRYP GetProgramEnvParameterdvARB) (GLenum target, GLuint index, GLdouble * params);    /* 455 */
-    void (GLAPIENTRYP GetProgramEnvParameterfvARB) (GLenum target, GLuint index, GLfloat * params);     /* 456 */
-    void (GLAPIENTRYP GetProgramLocalParameterdvARB) (GLenum target, GLuint index, GLdouble * params);  /* 457 */
-    void (GLAPIENTRYP GetProgramLocalParameterfvARB) (GLenum target, GLuint index, GLfloat * params);   /* 458 */
-    void (GLAPIENTRYP GetProgramStringARB) (GLenum target, GLenum pname, GLvoid * string);      /* 459 */
-    void (GLAPIENTRYP GetProgramivARB) (GLenum target, GLenum pname, GLint * params);   /* 460 */
-    void (GLAPIENTRYP GetVertexAttribdvARB) (GLuint index, GLenum pname, GLdouble * params);    /* 461 */
-    void (GLAPIENTRYP GetVertexAttribfvARB) (GLuint index, GLenum pname, GLfloat * params);     /* 462 */
-    void (GLAPIENTRYP GetVertexAttribivARB) (GLuint index, GLenum pname, GLint * params);       /* 463 */
-    void (GLAPIENTRYP ProgramEnvParameter4dARB) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);  /* 464 */
-    void (GLAPIENTRYP ProgramEnvParameter4dvARB) (GLenum target, GLuint index, const GLdouble * params);        /* 465 */
-    void (GLAPIENTRYP ProgramEnvParameter4fARB) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);      /* 466 */
-    void (GLAPIENTRYP ProgramEnvParameter4fvARB) (GLenum target, GLuint index, const GLfloat * params); /* 467 */
-    void (GLAPIENTRYP ProgramLocalParameter4dARB) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);        /* 468 */
-    void (GLAPIENTRYP ProgramLocalParameter4dvARB) (GLenum target, GLuint index, const GLdouble * params);      /* 469 */
-    void (GLAPIENTRYP ProgramLocalParameter4fARB) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);    /* 470 */
-    void (GLAPIENTRYP ProgramLocalParameter4fvARB) (GLenum target, GLuint index, const GLfloat * params);       /* 471 */
-    void (GLAPIENTRYP ProgramStringARB) (GLenum target, GLenum format, GLsizei len, const GLvoid * string);     /* 472 */
-    void (GLAPIENTRYP VertexAttrib1dARB) (GLuint index, GLdouble x);    /* 473 */
-    void (GLAPIENTRYP VertexAttrib1dvARB) (GLuint index, const GLdouble * v);   /* 474 */
-    void (GLAPIENTRYP VertexAttrib1fARB) (GLuint index, GLfloat x);     /* 475 */
-    void (GLAPIENTRYP VertexAttrib1fvARB) (GLuint index, const GLfloat * v);    /* 476 */
-    void (GLAPIENTRYP VertexAttrib1sARB) (GLuint index, GLshort x);     /* 477 */
-    void (GLAPIENTRYP VertexAttrib1svARB) (GLuint index, const GLshort * v);    /* 478 */
-    void (GLAPIENTRYP VertexAttrib2dARB) (GLuint index, GLdouble x, GLdouble y);        /* 479 */
-    void (GLAPIENTRYP VertexAttrib2dvARB) (GLuint index, const GLdouble * v);   /* 480 */
-    void (GLAPIENTRYP VertexAttrib2fARB) (GLuint index, GLfloat x, GLfloat y);  /* 481 */
-    void (GLAPIENTRYP VertexAttrib2fvARB) (GLuint index, const GLfloat * v);    /* 482 */
-    void (GLAPIENTRYP VertexAttrib2sARB) (GLuint index, GLshort x, GLshort y);  /* 483 */
-    void (GLAPIENTRYP VertexAttrib2svARB) (GLuint index, const GLshort * v);    /* 484 */
-    void (GLAPIENTRYP VertexAttrib3dARB) (GLuint index, GLdouble x, GLdouble y, GLdouble z);    /* 485 */
-    void (GLAPIENTRYP VertexAttrib3dvARB) (GLuint index, const GLdouble * v);   /* 486 */
-    void (GLAPIENTRYP VertexAttrib3fARB) (GLuint index, GLfloat x, GLfloat y, GLfloat z);       /* 487 */
-    void (GLAPIENTRYP VertexAttrib3fvARB) (GLuint index, const GLfloat * v);    /* 488 */
-    void (GLAPIENTRYP VertexAttrib3sARB) (GLuint index, GLshort x, GLshort y, GLshort z);       /* 489 */
-    void (GLAPIENTRYP VertexAttrib3svARB) (GLuint index, const GLshort * v);    /* 490 */
-    void (GLAPIENTRYP VertexAttrib4NbvARB) (GLuint index, const GLbyte * v);    /* 491 */
-    void (GLAPIENTRYP VertexAttrib4NivARB) (GLuint index, const GLint * v);     /* 492 */
-    void (GLAPIENTRYP VertexAttrib4NsvARB) (GLuint index, const GLshort * v);   /* 493 */
-    void (GLAPIENTRYP VertexAttrib4NubARB) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);  /* 494 */
-    void (GLAPIENTRYP VertexAttrib4NubvARB) (GLuint index, const GLubyte * v);  /* 495 */
-    void (GLAPIENTRYP VertexAttrib4NuivARB) (GLuint index, const GLuint * v);   /* 496 */
-    void (GLAPIENTRYP VertexAttrib4NusvARB) (GLuint index, const GLushort * v); /* 497 */
-    void (GLAPIENTRYP VertexAttrib4bvARB) (GLuint index, const GLbyte * v);     /* 498 */
-    void (GLAPIENTRYP VertexAttrib4dARB) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);        /* 499 */
-    void (GLAPIENTRYP VertexAttrib4dvARB) (GLuint index, const GLdouble * v);   /* 500 */
-    void (GLAPIENTRYP VertexAttrib4fARB) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);    /* 501 */
-    void (GLAPIENTRYP VertexAttrib4fvARB) (GLuint index, const GLfloat * v);    /* 502 */
-    void (GLAPIENTRYP VertexAttrib4ivARB) (GLuint index, const GLint * v);      /* 503 */
-    void (GLAPIENTRYP VertexAttrib4sARB) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);    /* 504 */
-    void (GLAPIENTRYP VertexAttrib4svARB) (GLuint index, const GLshort * v);    /* 505 */
-    void (GLAPIENTRYP VertexAttrib4ubvARB) (GLuint index, const GLubyte * v);   /* 506 */
-    void (GLAPIENTRYP VertexAttrib4uivARB) (GLuint index, const GLuint * v);    /* 507 */
-    void (GLAPIENTRYP VertexAttrib4usvARB) (GLuint index, const GLushort * v);  /* 508 */
-    void (GLAPIENTRYP VertexAttribPointerARB) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer);    /* 509 */
-    void (GLAPIENTRYP BindBufferARB) (GLenum target, GLuint buffer);    /* 510 */
-    void (GLAPIENTRYP BufferDataARB) (GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage);    /* 511 */
-    void (GLAPIENTRYP BufferSubDataARB) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data);   /* 512 */
-    void (GLAPIENTRYP DeleteBuffersARB) (GLsizei n, const GLuint * buffer);     /* 513 */
-    void (GLAPIENTRYP GenBuffersARB) (GLsizei n, GLuint * buffer);      /* 514 */
-    void (GLAPIENTRYP GetBufferParameterivARB) (GLenum target, GLenum pname, GLint * params);   /* 515 */
-    void (GLAPIENTRYP GetBufferPointervARB) (GLenum target, GLenum pname, GLvoid ** params);    /* 516 */
-    void (GLAPIENTRYP GetBufferSubDataARB) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid * data);      /* 517 */
-     GLboolean(GLAPIENTRYP IsBufferARB) (GLuint buffer);        /* 518 */
-    GLvoid *(GLAPIENTRYP MapBufferARB) (GLenum target, GLenum access);  /* 519 */
-     GLboolean(GLAPIENTRYP UnmapBufferARB) (GLenum target);     /* 520 */
-    void (GLAPIENTRYP BeginQueryARB) (GLenum target, GLuint id);        /* 521 */
-    void (GLAPIENTRYP DeleteQueriesARB) (GLsizei n, const GLuint * ids);        /* 522 */
-    void (GLAPIENTRYP EndQueryARB) (GLenum target);     /* 523 */
-    void (GLAPIENTRYP GenQueriesARB) (GLsizei n, GLuint * ids); /* 524 */
-    void (GLAPIENTRYP GetQueryObjectivARB) (GLuint id, GLenum pname, GLint * params);   /* 525 */
-    void (GLAPIENTRYP GetQueryObjectuivARB) (GLuint id, GLenum pname, GLuint * params); /* 526 */
-    void (GLAPIENTRYP GetQueryivARB) (GLenum target, GLenum pname, GLint * params);     /* 527 */
-     GLboolean(GLAPIENTRYP IsQueryARB) (GLuint id);     /* 528 */
-    void (GLAPIENTRYP AttachObjectARB) (GLhandleARB containerObj, GLhandleARB obj);     /* 529 */
-    void (GLAPIENTRYP CompileShaderARB) (GLhandleARB shader);   /* 530 */
-     GLhandleARB(GLAPIENTRYP CreateProgramObjectARB) (void);    /* 531 */
-     GLhandleARB(GLAPIENTRYP CreateShaderObjectARB) (GLenum shaderType);        /* 532 */
-    void (GLAPIENTRYP DeleteObjectARB) (GLhandleARB obj);       /* 533 */
-    void (GLAPIENTRYP DetachObjectARB) (GLhandleARB containerObj, GLhandleARB attachedObj);     /* 534 */
-    void (GLAPIENTRYP GetActiveUniformARB) (GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name);       /* 535 */
-    void (GLAPIENTRYP GetAttachedObjectsARB) (GLhandleARB containerObj, GLsizei maxLength, GLsizei * length, GLhandleARB * infoLog);    /* 536 */
-     GLhandleARB(GLAPIENTRYP GetHandleARB) (GLenum pname);      /* 537 */
-    void (GLAPIENTRYP GetInfoLogARB) (GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog);       /* 538 */
-    void (GLAPIENTRYP GetObjectParameterfvARB) (GLhandleARB obj, GLenum pname, GLfloat * params);       /* 539 */
-    void (GLAPIENTRYP GetObjectParameterivARB) (GLhandleARB obj, GLenum pname, GLint * params); /* 540 */
-    void (GLAPIENTRYP GetShaderSourceARB) (GLhandleARB shader, GLsizei bufSize, GLsizei * length, GLcharARB * source);  /* 541 */
-     GLint(GLAPIENTRYP GetUniformLocationARB) (GLhandleARB program, const GLcharARB * name);    /* 542 */
-    void (GLAPIENTRYP GetUniformfvARB) (GLhandleARB program, GLint location, GLfloat * params); /* 543 */
-    void (GLAPIENTRYP GetUniformivARB) (GLhandleARB program, GLint location, GLint * params);   /* 544 */
-    void (GLAPIENTRYP LinkProgramARB) (GLhandleARB program);    /* 545 */
-    void (GLAPIENTRYP ShaderSourceARB) (GLhandleARB shader, GLsizei count, const GLcharARB ** string, const GLint * length);    /* 546 */
-    void (GLAPIENTRYP Uniform1fARB) (GLint location, GLfloat v0);       /* 547 */
-    void (GLAPIENTRYP Uniform1fvARB) (GLint location, GLsizei count, const GLfloat * value);    /* 548 */
-    void (GLAPIENTRYP Uniform1iARB) (GLint location, GLint v0); /* 549 */
-    void (GLAPIENTRYP Uniform1ivARB) (GLint location, GLsizei count, const GLint * value);      /* 550 */
-    void (GLAPIENTRYP Uniform2fARB) (GLint location, GLfloat v0, GLfloat v1);   /* 551 */
-    void (GLAPIENTRYP Uniform2fvARB) (GLint location, GLsizei count, const GLfloat * value);    /* 552 */
-    void (GLAPIENTRYP Uniform2iARB) (GLint location, GLint v0, GLint v1);       /* 553 */
-    void (GLAPIENTRYP Uniform2ivARB) (GLint location, GLsizei count, const GLint * value);      /* 554 */
-    void (GLAPIENTRYP Uniform3fARB) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);       /* 555 */
-    void (GLAPIENTRYP Uniform3fvARB) (GLint location, GLsizei count, const GLfloat * value);    /* 556 */
-    void (GLAPIENTRYP Uniform3iARB) (GLint location, GLint v0, GLint v1, GLint v2);     /* 557 */
-    void (GLAPIENTRYP Uniform3ivARB) (GLint location, GLsizei count, const GLint * value);      /* 558 */
-    void (GLAPIENTRYP Uniform4fARB) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);   /* 559 */
-    void (GLAPIENTRYP Uniform4fvARB) (GLint location, GLsizei count, const GLfloat * value);    /* 560 */
-    void (GLAPIENTRYP Uniform4iARB) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);   /* 561 */
-    void (GLAPIENTRYP Uniform4ivARB) (GLint location, GLsizei count, const GLint * value);      /* 562 */
-    void (GLAPIENTRYP UniformMatrix2fvARB) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 563 */
-    void (GLAPIENTRYP UniformMatrix3fvARB) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 564 */
-    void (GLAPIENTRYP UniformMatrix4fvARB) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 565 */
-    void (GLAPIENTRYP UseProgramObjectARB) (GLhandleARB program);       /* 566 */
-    void (GLAPIENTRYP ValidateProgramARB) (GLhandleARB program);        /* 567 */
-    void (GLAPIENTRYP BindAttribLocationARB) (GLhandleARB program, GLuint index, const GLcharARB * name);       /* 568 */
-    void (GLAPIENTRYP GetActiveAttribARB) (GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name);        /* 569 */
-     GLint(GLAPIENTRYP GetAttribLocationARB) (GLhandleARB program, const GLcharARB * name);     /* 570 */
-    void (GLAPIENTRYP DrawBuffersARB) (GLsizei n, const GLenum * bufs); /* 571 */
-    void (GLAPIENTRYP ClampColorARB) (GLenum target, GLenum clamp);     /* 572 */
-    void (GLAPIENTRYP DrawArraysInstancedARB) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);     /* 573 */
-    void (GLAPIENTRYP DrawElementsInstancedARB) (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount);   /* 574 */
-    void (GLAPIENTRYP RenderbufferStorageMultisample) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);   /* 575 */
-    void (GLAPIENTRYP FramebufferTextureARB) (GLenum target, GLenum attachment, GLuint texture, GLint level);   /* 576 */
-    void (GLAPIENTRYP FramebufferTextureFaceARB) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);  /* 577 */
-    void (GLAPIENTRYP ProgramParameteriARB) (GLuint program, GLenum pname, GLint value);        /* 578 */
-    void (GLAPIENTRYP VertexAttribDivisorARB) (GLuint index, GLuint divisor);   /* 579 */
-    void (GLAPIENTRYP FlushMappedBufferRange) (GLenum target, GLintptr offset, GLsizeiptr length);      /* 580 */
-    GLvoid *(GLAPIENTRYP MapBufferRange) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);        /* 581 */
-    void (GLAPIENTRYP TexBufferARB) (GLenum target, GLenum internalFormat, GLuint buffer);      /* 582 */
-    void (GLAPIENTRYP BindVertexArray) (GLuint array);  /* 583 */
-    void (GLAPIENTRYP GenVertexArrays) (GLsizei n, GLuint * arrays);    /* 584 */
-    void (GLAPIENTRYP CopyBufferSubData) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);   /* 585 */
-     GLenum(GLAPIENTRYP ClientWaitSync) (GLsync sync, GLbitfield flags, GLuint64 timeout);      /* 586 */
-    void (GLAPIENTRYP DeleteSync) (GLsync sync);        /* 587 */
-     GLsync(GLAPIENTRYP FenceSync) (GLenum condition, GLbitfield flags);        /* 588 */
-    void (GLAPIENTRYP GetInteger64v) (GLenum pname, GLint64 * params);  /* 589 */
-    void (GLAPIENTRYP GetSynciv) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values);        /* 590 */
-     GLboolean(GLAPIENTRYP IsSync) (GLsync sync);       /* 591 */
-    void (GLAPIENTRYP WaitSync) (GLsync sync, GLbitfield flags, GLuint64 timeout);      /* 592 */
-    void (GLAPIENTRYP DrawElementsBaseVertex) (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex);      /* 593 */
-    void (GLAPIENTRYP DrawElementsInstancedBaseVertex) (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex);  /* 594 */
-    void (GLAPIENTRYP DrawRangeElementsBaseVertex) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex);       /* 595 */
-    void (GLAPIENTRYP MultiDrawElementsBaseVertex) (GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount, const GLint * basevertex);     /* 596 */
-    void (GLAPIENTRYP BlendEquationSeparateiARB) (GLuint buf, GLenum modeRGB, GLenum modeA);    /* 597 */
-    void (GLAPIENTRYP BlendEquationiARB) (GLuint buf, GLenum mode);     /* 598 */
-    void (GLAPIENTRYP BlendFuncSeparateiARB) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA);      /* 599 */
-    void (GLAPIENTRYP BlendFunciARB) (GLuint buf, GLenum src, GLenum dst);      /* 600 */
-    void (GLAPIENTRYP BindSampler) (GLuint unit, GLuint sampler);       /* 601 */
-    void (GLAPIENTRYP DeleteSamplers) (GLsizei count, const GLuint * samplers); /* 602 */
-    void (GLAPIENTRYP GenSamplers) (GLsizei count, GLuint * samplers);  /* 603 */
-    void (GLAPIENTRYP GetSamplerParameterIiv) (GLuint sampler, GLenum pname, GLint * params);   /* 604 */
-    void (GLAPIENTRYP GetSamplerParameterIuiv) (GLuint sampler, GLenum pname, GLuint * params); /* 605 */
-    void (GLAPIENTRYP GetSamplerParameterfv) (GLuint sampler, GLenum pname, GLfloat * params);  /* 606 */
-    void (GLAPIENTRYP GetSamplerParameteriv) (GLuint sampler, GLenum pname, GLint * params);    /* 607 */
-     GLboolean(GLAPIENTRYP IsSampler) (GLuint sampler); /* 608 */
-    void (GLAPIENTRYP SamplerParameterIiv) (GLuint sampler, GLenum pname, const GLint * params);        /* 609 */
-    void (GLAPIENTRYP SamplerParameterIuiv) (GLuint sampler, GLenum pname, const GLuint * params);      /* 610 */
-    void (GLAPIENTRYP SamplerParameterf) (GLuint sampler, GLenum pname, GLfloat param); /* 611 */
-    void (GLAPIENTRYP SamplerParameterfv) (GLuint sampler, GLenum pname, const GLfloat * params);       /* 612 */
-    void (GLAPIENTRYP SamplerParameteri) (GLuint sampler, GLenum pname, GLint param);   /* 613 */
-    void (GLAPIENTRYP SamplerParameteriv) (GLuint sampler, GLenum pname, const GLint * params); /* 614 */
-    void (GLAPIENTRYP ColorP3ui) (GLenum type, GLuint color);   /* 615 */
-    void (GLAPIENTRYP ColorP3uiv) (GLenum type, const GLuint * color);  /* 616 */
-    void (GLAPIENTRYP ColorP4ui) (GLenum type, GLuint color);   /* 617 */
-    void (GLAPIENTRYP ColorP4uiv) (GLenum type, const GLuint * color);  /* 618 */
-    void (GLAPIENTRYP MultiTexCoordP1ui) (GLenum texture, GLenum type, GLuint coords);  /* 619 */
-    void (GLAPIENTRYP MultiTexCoordP1uiv) (GLenum texture, GLenum type, const GLuint * coords); /* 620 */
-    void (GLAPIENTRYP MultiTexCoordP2ui) (GLenum texture, GLenum type, GLuint coords);  /* 621 */
-    void (GLAPIENTRYP MultiTexCoordP2uiv) (GLenum texture, GLenum type, const GLuint * coords); /* 622 */
-    void (GLAPIENTRYP MultiTexCoordP3ui) (GLenum texture, GLenum type, GLuint coords);  /* 623 */
-    void (GLAPIENTRYP MultiTexCoordP3uiv) (GLenum texture, GLenum type, const GLuint * coords); /* 624 */
-    void (GLAPIENTRYP MultiTexCoordP4ui) (GLenum texture, GLenum type, GLuint coords);  /* 625 */
-    void (GLAPIENTRYP MultiTexCoordP4uiv) (GLenum texture, GLenum type, const GLuint * coords); /* 626 */
-    void (GLAPIENTRYP NormalP3ui) (GLenum type, GLuint coords); /* 627 */
-    void (GLAPIENTRYP NormalP3uiv) (GLenum type, const GLuint * coords);        /* 628 */
-    void (GLAPIENTRYP SecondaryColorP3ui) (GLenum type, GLuint color);  /* 629 */
-    void (GLAPIENTRYP SecondaryColorP3uiv) (GLenum type, const GLuint * color); /* 630 */
-    void (GLAPIENTRYP TexCoordP1ui) (GLenum type, GLuint coords);       /* 631 */
-    void (GLAPIENTRYP TexCoordP1uiv) (GLenum type, const GLuint * coords);      /* 632 */
-    void (GLAPIENTRYP TexCoordP2ui) (GLenum type, GLuint coords);       /* 633 */
-    void (GLAPIENTRYP TexCoordP2uiv) (GLenum type, const GLuint * coords);      /* 634 */
-    void (GLAPIENTRYP TexCoordP3ui) (GLenum type, GLuint coords);       /* 635 */
-    void (GLAPIENTRYP TexCoordP3uiv) (GLenum type, const GLuint * coords);      /* 636 */
-    void (GLAPIENTRYP TexCoordP4ui) (GLenum type, GLuint coords);       /* 637 */
-    void (GLAPIENTRYP TexCoordP4uiv) (GLenum type, const GLuint * coords);      /* 638 */
-    void (GLAPIENTRYP VertexAttribP1ui) (GLuint index, GLenum type, GLboolean normalized, GLuint value);        /* 639 */
-    void (GLAPIENTRYP VertexAttribP1uiv) (GLuint index, GLenum type, GLboolean normalized, const GLuint * value);       /* 640 */
-    void (GLAPIENTRYP VertexAttribP2ui) (GLuint index, GLenum type, GLboolean normalized, GLuint value);        /* 641 */
-    void (GLAPIENTRYP VertexAttribP2uiv) (GLuint index, GLenum type, GLboolean normalized, const GLuint * value);       /* 642 */
-    void (GLAPIENTRYP VertexAttribP3ui) (GLuint index, GLenum type, GLboolean normalized, GLuint value);        /* 643 */
-    void (GLAPIENTRYP VertexAttribP3uiv) (GLuint index, GLenum type, GLboolean normalized, const GLuint * value);       /* 644 */
-    void (GLAPIENTRYP VertexAttribP4ui) (GLuint index, GLenum type, GLboolean normalized, GLuint value);        /* 645 */
-    void (GLAPIENTRYP VertexAttribP4uiv) (GLuint index, GLenum type, GLboolean normalized, const GLuint * value);       /* 646 */
-    void (GLAPIENTRYP VertexP2ui) (GLenum type, GLuint value);  /* 647 */
-    void (GLAPIENTRYP VertexP2uiv) (GLenum type, const GLuint * value); /* 648 */
-    void (GLAPIENTRYP VertexP3ui) (GLenum type, GLuint value);  /* 649 */
-    void (GLAPIENTRYP VertexP3uiv) (GLenum type, const GLuint * value); /* 650 */
-    void (GLAPIENTRYP VertexP4ui) (GLenum type, GLuint value);  /* 651 */
-    void (GLAPIENTRYP VertexP4uiv) (GLenum type, const GLuint * value); /* 652 */
-    void (GLAPIENTRYP BindTransformFeedback) (GLenum target, GLuint id);        /* 653 */
-    void (GLAPIENTRYP DeleteTransformFeedbacks) (GLsizei n, const GLuint * ids);        /* 654 */
-    void (GLAPIENTRYP DrawTransformFeedback) (GLenum mode, GLuint id);  /* 655 */
-    void (GLAPIENTRYP GenTransformFeedbacks) (GLsizei n, GLuint * ids); /* 656 */
-     GLboolean(GLAPIENTRYP IsTransformFeedback) (GLuint id);    /* 657 */
-    void (GLAPIENTRYP PauseTransformFeedback) (void);   /* 658 */
-    void (GLAPIENTRYP ResumeTransformFeedback) (void);  /* 659 */
-    void (GLAPIENTRYP ClearDepthf) (GLclampf depth);    /* 660 */
-    void (GLAPIENTRYP DepthRangef) (GLclampf zNear, GLclampf zFar);     /* 661 */
-    void (GLAPIENTRYP GetShaderPrecisionFormat) (GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision);    /* 662 */
-    void (GLAPIENTRYP ReleaseShaderCompiler) (void);    /* 663 */
-    void (GLAPIENTRYP ShaderBinary) (GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length);    /* 664 */
-     GLenum(GLAPIENTRYP GetGraphicsResetStatusARB) (void);      /* 665 */
-    void (GLAPIENTRYP GetnColorTableARB) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table);  /* 666 */
-    void (GLAPIENTRYP GetnCompressedTexImageARB) (GLenum target, GLint lod, GLsizei bufSize, GLvoid * img);     /* 667 */
-    void (GLAPIENTRYP GetnConvolutionFilterARB) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image);   /* 668 */
-    void (GLAPIENTRYP GetnHistogramARB) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 669 */
-    void (GLAPIENTRYP GetnMapdvARB) (GLenum target, GLenum query, GLsizei bufSize, GLdouble * v);       /* 670 */
-    void (GLAPIENTRYP GetnMapfvARB) (GLenum target, GLenum query, GLsizei bufSize, GLfloat * v);        /* 671 */
-    void (GLAPIENTRYP GetnMapivARB) (GLenum target, GLenum query, GLsizei bufSize, GLint * v);  /* 672 */
-    void (GLAPIENTRYP GetnMinmaxARB) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values);    /* 673 */
-    void (GLAPIENTRYP GetnPixelMapfvARB) (GLenum map, GLsizei bufSize, GLfloat * values);       /* 674 */
-    void (GLAPIENTRYP GetnPixelMapuivARB) (GLenum map, GLsizei bufSize, GLuint * values);       /* 675 */
-    void (GLAPIENTRYP GetnPixelMapusvARB) (GLenum map, GLsizei bufSize, GLushort * values);     /* 676 */
-    void (GLAPIENTRYP GetnPolygonStippleARB) (GLsizei bufSize, GLubyte * pattern);      /* 677 */
-    void (GLAPIENTRYP GetnSeparableFilterARB) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span);     /* 678 */
-    void (GLAPIENTRYP GetnTexImageARB) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 679 */
-    void (GLAPIENTRYP GetnUniformdvARB) (GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params);      /* 680 */
-    void (GLAPIENTRYP GetnUniformfvARB) (GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params);       /* 681 */
-    void (GLAPIENTRYP GetnUniformivARB) (GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 682 */
-    void (GLAPIENTRYP GetnUniformuivARB) (GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params);       /* 683 */
-    void (GLAPIENTRYP ReadnPixelsARB) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data);    /* 684 */
-    void (GLAPIENTRYP TexStorage1D) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width);      /* 685 */
-    void (GLAPIENTRYP TexStorage2D) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height);      /* 686 */
-    void (GLAPIENTRYP TexStorage3D) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);       /* 687 */
-    void (GLAPIENTRYP TextureStorage1DEXT) (GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width);       /* 688 */
-    void (GLAPIENTRYP TextureStorage2DEXT) (GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height);       /* 689 */
-    void (GLAPIENTRYP TextureStorage3DEXT) (GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);        /* 690 */
-    void (GLAPIENTRYP PolygonOffsetEXT) (GLfloat factor, GLfloat bias); /* 691 */
-    void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS) (GLenum pname, GLfloat * params);  /* 692 */
-    void (GLAPIENTRYP GetPixelTexGenParameterivSGIS) (GLenum pname, GLint * params);    /* 693 */
-    void (GLAPIENTRYP PixelTexGenParameterfSGIS) (GLenum pname, GLfloat param); /* 694 */
-    void (GLAPIENTRYP PixelTexGenParameterfvSGIS) (GLenum pname, const GLfloat * params);       /* 695 */
-    void (GLAPIENTRYP PixelTexGenParameteriSGIS) (GLenum pname, GLint param);   /* 696 */
-    void (GLAPIENTRYP PixelTexGenParameterivSGIS) (GLenum pname, const GLint * params); /* 697 */
-    void (GLAPIENTRYP SampleMaskSGIS) (GLclampf value, GLboolean invert);       /* 698 */
-    void (GLAPIENTRYP SamplePatternSGIS) (GLenum pattern);      /* 699 */
-    void (GLAPIENTRYP ColorPointerEXT) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer);        /* 700 */
-    void (GLAPIENTRYP EdgeFlagPointerEXT) (GLsizei stride, GLsizei count, const GLboolean * pointer);   /* 701 */
-    void (GLAPIENTRYP IndexPointerEXT) (GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer);    /* 702 */
-    void (GLAPIENTRYP NormalPointerEXT) (GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer);   /* 703 */
-    void (GLAPIENTRYP TexCoordPointerEXT) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer);     /* 704 */
-    void (GLAPIENTRYP VertexPointerEXT) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer);       /* 705 */
-    void (GLAPIENTRYP PointParameterfEXT) (GLenum pname, GLfloat param);        /* 706 */
-    void (GLAPIENTRYP PointParameterfvEXT) (GLenum pname, const GLfloat * params);      /* 707 */
-    void (GLAPIENTRYP LockArraysEXT) (GLint first, GLsizei count);      /* 708 */
-    void (GLAPIENTRYP UnlockArraysEXT) (void);  /* 709 */
-    void (GLAPIENTRYP SecondaryColor3bEXT) (GLbyte red, GLbyte green, GLbyte blue);     /* 710 */
-    void (GLAPIENTRYP SecondaryColor3bvEXT) (const GLbyte * v); /* 711 */
-    void (GLAPIENTRYP SecondaryColor3dEXT) (GLdouble red, GLdouble green, GLdouble blue);       /* 712 */
-    void (GLAPIENTRYP SecondaryColor3dvEXT) (const GLdouble * v);       /* 713 */
-    void (GLAPIENTRYP SecondaryColor3fEXT) (GLfloat red, GLfloat green, GLfloat blue);  /* 714 */
-    void (GLAPIENTRYP SecondaryColor3fvEXT) (const GLfloat * v);        /* 715 */
-    void (GLAPIENTRYP SecondaryColor3iEXT) (GLint red, GLint green, GLint blue);        /* 716 */
-    void (GLAPIENTRYP SecondaryColor3ivEXT) (const GLint * v);  /* 717 */
-    void (GLAPIENTRYP SecondaryColor3sEXT) (GLshort red, GLshort green, GLshort blue);  /* 718 */
-    void (GLAPIENTRYP SecondaryColor3svEXT) (const GLshort * v);        /* 719 */
-    void (GLAPIENTRYP SecondaryColor3ubEXT) (GLubyte red, GLubyte green, GLubyte blue); /* 720 */
-    void (GLAPIENTRYP SecondaryColor3ubvEXT) (const GLubyte * v);       /* 721 */
-    void (GLAPIENTRYP SecondaryColor3uiEXT) (GLuint red, GLuint green, GLuint blue);    /* 722 */
-    void (GLAPIENTRYP SecondaryColor3uivEXT) (const GLuint * v);        /* 723 */
-    void (GLAPIENTRYP SecondaryColor3usEXT) (GLushort red, GLushort green, GLushort blue);      /* 724 */
-    void (GLAPIENTRYP SecondaryColor3usvEXT) (const GLushort * v);      /* 725 */
-    void (GLAPIENTRYP SecondaryColorPointerEXT) (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer);      /* 726 */
-    void (GLAPIENTRYP MultiDrawArraysEXT) (GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 727 */
-    void (GLAPIENTRYP MultiDrawElementsEXT) (GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount);      /* 728 */
-    void (GLAPIENTRYP FogCoordPointerEXT) (GLenum type, GLsizei stride, const GLvoid * pointer);        /* 729 */
-    void (GLAPIENTRYP FogCoorddEXT) (GLdouble coord);   /* 730 */
-    void (GLAPIENTRYP FogCoorddvEXT) (const GLdouble * coord);  /* 731 */
-    void (GLAPIENTRYP FogCoordfEXT) (GLfloat coord);    /* 732 */
-    void (GLAPIENTRYP FogCoordfvEXT) (const GLfloat * coord);   /* 733 */
-    void (GLAPIENTRYP PixelTexGenSGIX) (GLenum mode);   /* 734 */
-    void (GLAPIENTRYP BlendFuncSeparateEXT) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);   /* 735 */
-    void (GLAPIENTRYP FlushVertexArrayRangeNV) (void);  /* 736 */
-    void (GLAPIENTRYP VertexArrayRangeNV) (GLsizei length, const GLvoid * pointer);     /* 737 */
-    void (GLAPIENTRYP CombinerInputNV) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);    /* 738 */
-    void (GLAPIENTRYP CombinerOutputNV) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);        /* 739 */
-    void (GLAPIENTRYP CombinerParameterfNV) (GLenum pname, GLfloat param);      /* 740 */
-    void (GLAPIENTRYP CombinerParameterfvNV) (GLenum pname, const GLfloat * params);    /* 741 */
-    void (GLAPIENTRYP CombinerParameteriNV) (GLenum pname, GLint param);        /* 742 */
-    void (GLAPIENTRYP CombinerParameterivNV) (GLenum pname, const GLint * params);      /* 743 */
-    void (GLAPIENTRYP FinalCombinerInputNV) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);     /* 744 */
-    void (GLAPIENTRYP GetCombinerInputParameterfvNV) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params);   /* 745 */
-    void (GLAPIENTRYP GetCombinerInputParameterivNV) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params);     /* 746 */
-    void (GLAPIENTRYP GetCombinerOutputParameterfvNV) (GLenum stage, GLenum portion, GLenum pname, GLfloat * params);   /* 747 */
-    void (GLAPIENTRYP GetCombinerOutputParameterivNV) (GLenum stage, GLenum portion, GLenum pname, GLint * params);     /* 748 */
-    void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV) (GLenum variable, GLenum pname, GLfloat * params);    /* 749 */
-    void (GLAPIENTRYP GetFinalCombinerInputParameterivNV) (GLenum variable, GLenum pname, GLint * params);      /* 750 */
-    void (GLAPIENTRYP ResizeBuffersMESA) (void);        /* 751 */
-    void (GLAPIENTRYP WindowPos2dMESA) (GLdouble x, GLdouble y);        /* 752 */
-    void (GLAPIENTRYP WindowPos2dvMESA) (const GLdouble * v);   /* 753 */
-    void (GLAPIENTRYP WindowPos2fMESA) (GLfloat x, GLfloat y);  /* 754 */
-    void (GLAPIENTRYP WindowPos2fvMESA) (const GLfloat * v);    /* 755 */
-    void (GLAPIENTRYP WindowPos2iMESA) (GLint x, GLint y);      /* 756 */
-    void (GLAPIENTRYP WindowPos2ivMESA) (const GLint * v);      /* 757 */
-    void (GLAPIENTRYP WindowPos2sMESA) (GLshort x, GLshort y);  /* 758 */
-    void (GLAPIENTRYP WindowPos2svMESA) (const GLshort * v);    /* 759 */
-    void (GLAPIENTRYP WindowPos3dMESA) (GLdouble x, GLdouble y, GLdouble z);    /* 760 */
-    void (GLAPIENTRYP WindowPos3dvMESA) (const GLdouble * v);   /* 761 */
-    void (GLAPIENTRYP WindowPos3fMESA) (GLfloat x, GLfloat y, GLfloat z);       /* 762 */
-    void (GLAPIENTRYP WindowPos3fvMESA) (const GLfloat * v);    /* 763 */
-    void (GLAPIENTRYP WindowPos3iMESA) (GLint x, GLint y, GLint z);     /* 764 */
-    void (GLAPIENTRYP WindowPos3ivMESA) (const GLint * v);      /* 765 */
-    void (GLAPIENTRYP WindowPos3sMESA) (GLshort x, GLshort y, GLshort z);       /* 766 */
-    void (GLAPIENTRYP WindowPos3svMESA) (const GLshort * v);    /* 767 */
-    void (GLAPIENTRYP WindowPos4dMESA) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);        /* 768 */
-    void (GLAPIENTRYP WindowPos4dvMESA) (const GLdouble * v);   /* 769 */
-    void (GLAPIENTRYP WindowPos4fMESA) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);    /* 770 */
-    void (GLAPIENTRYP WindowPos4fvMESA) (const GLfloat * v);    /* 771 */
-    void (GLAPIENTRYP WindowPos4iMESA) (GLint x, GLint y, GLint z, GLint w);    /* 772 */
-    void (GLAPIENTRYP WindowPos4ivMESA) (const GLint * v);      /* 773 */
-    void (GLAPIENTRYP WindowPos4sMESA) (GLshort x, GLshort y, GLshort z, GLshort w);    /* 774 */
-    void (GLAPIENTRYP WindowPos4svMESA) (const GLshort * v);    /* 775 */
-    void (GLAPIENTRYP MultiModeDrawArraysIBM) (const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);   /* 776 */
-    void (GLAPIENTRYP MultiModeDrawElementsIBM) (const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);  /* 777 */
-    void (GLAPIENTRYP DeleteFencesNV) (GLsizei n, const GLuint * fences);       /* 778 */
-    void (GLAPIENTRYP FinishFenceNV) (GLuint fence);    /* 779 */
-    void (GLAPIENTRYP GenFencesNV) (GLsizei n, GLuint * fences);        /* 780 */
-    void (GLAPIENTRYP GetFenceivNV) (GLuint fence, GLenum pname, GLint * params);       /* 781 */
-     GLboolean(GLAPIENTRYP IsFenceNV) (GLuint fence);   /* 782 */
-    void (GLAPIENTRYP SetFenceNV) (GLuint fence, GLenum condition);     /* 783 */
-     GLboolean(GLAPIENTRYP TestFenceNV) (GLuint fence); /* 784 */
-     GLboolean(GLAPIENTRYP AreProgramsResidentNV) (GLsizei n, const GLuint * ids, GLboolean * residences);      /* 785 */
-    void (GLAPIENTRYP BindProgramNV) (GLenum target, GLuint program);   /* 786 */
-    void (GLAPIENTRYP DeleteProgramsNV) (GLsizei n, const GLuint * programs);   /* 787 */
-    void (GLAPIENTRYP ExecuteProgramNV) (GLenum target, GLuint id, const GLfloat * params);     /* 788 */
-    void (GLAPIENTRYP GenProgramsNV) (GLsizei n, GLuint * programs);    /* 789 */
-    void (GLAPIENTRYP GetProgramParameterdvNV) (GLenum target, GLuint index, GLenum pname, GLdouble * params);  /* 790 */
-    void (GLAPIENTRYP GetProgramParameterfvNV) (GLenum target, GLuint index, GLenum pname, GLfloat * params);   /* 791 */
-    void (GLAPIENTRYP GetProgramStringNV) (GLuint id, GLenum pname, GLubyte * program); /* 792 */
-    void (GLAPIENTRYP GetProgramivNV) (GLuint id, GLenum pname, GLint * params);        /* 793 */
-    void (GLAPIENTRYP GetTrackMatrixivNV) (GLenum target, GLuint address, GLenum pname, GLint * params);        /* 794 */
-    void (GLAPIENTRYP GetVertexAttribPointervNV) (GLuint index, GLenum pname, GLvoid ** pointer);       /* 795 */
-    void (GLAPIENTRYP GetVertexAttribdvNV) (GLuint index, GLenum pname, GLdouble * params);     /* 796 */
-    void (GLAPIENTRYP GetVertexAttribfvNV) (GLuint index, GLenum pname, GLfloat * params);      /* 797 */
-    void (GLAPIENTRYP GetVertexAttribivNV) (GLuint index, GLenum pname, GLint * params);        /* 798 */
-     GLboolean(GLAPIENTRYP IsProgramNV) (GLuint program);       /* 799 */
-    void (GLAPIENTRYP LoadProgramNV) (GLenum target, GLuint id, GLsizei len, const GLubyte * program);  /* 800 */
-    void (GLAPIENTRYP ProgramParameters4dvNV) (GLenum target, GLuint index, GLsizei num, const GLdouble * params);      /* 801 */
-    void (GLAPIENTRYP ProgramParameters4fvNV) (GLenum target, GLuint index, GLsizei num, const GLfloat * params);       /* 802 */
-    void (GLAPIENTRYP RequestResidentProgramsNV) (GLsizei n, const GLuint * ids);       /* 803 */
-    void (GLAPIENTRYP TrackMatrixNV) (GLenum target, GLuint address, GLenum matrix, GLenum transform);  /* 804 */
-    void (GLAPIENTRYP VertexAttrib1dNV) (GLuint index, GLdouble x);     /* 805 */
-    void (GLAPIENTRYP VertexAttrib1dvNV) (GLuint index, const GLdouble * v);    /* 806 */
-    void (GLAPIENTRYP VertexAttrib1fNV) (GLuint index, GLfloat x);      /* 807 */
-    void (GLAPIENTRYP VertexAttrib1fvNV) (GLuint index, const GLfloat * v);     /* 808 */
-    void (GLAPIENTRYP VertexAttrib1sNV) (GLuint index, GLshort x);      /* 809 */
-    void (GLAPIENTRYP VertexAttrib1svNV) (GLuint index, const GLshort * v);     /* 810 */
-    void (GLAPIENTRYP VertexAttrib2dNV) (GLuint index, GLdouble x, GLdouble y); /* 811 */
-    void (GLAPIENTRYP VertexAttrib2dvNV) (GLuint index, const GLdouble * v);    /* 812 */
-    void (GLAPIENTRYP VertexAttrib2fNV) (GLuint index, GLfloat x, GLfloat y);   /* 813 */
-    void (GLAPIENTRYP VertexAttrib2fvNV) (GLuint index, const GLfloat * v);     /* 814 */
-    void (GLAPIENTRYP VertexAttrib2sNV) (GLuint index, GLshort x, GLshort y);   /* 815 */
-    void (GLAPIENTRYP VertexAttrib2svNV) (GLuint index, const GLshort * v);     /* 816 */
-    void (GLAPIENTRYP VertexAttrib3dNV) (GLuint index, GLdouble x, GLdouble y, GLdouble z);     /* 817 */
-    void (GLAPIENTRYP VertexAttrib3dvNV) (GLuint index, const GLdouble * v);    /* 818 */
-    void (GLAPIENTRYP VertexAttrib3fNV) (GLuint index, GLfloat x, GLfloat y, GLfloat z);        /* 819 */
-    void (GLAPIENTRYP VertexAttrib3fvNV) (GLuint index, const GLfloat * v);     /* 820 */
-    void (GLAPIENTRYP VertexAttrib3sNV) (GLuint index, GLshort x, GLshort y, GLshort z);        /* 821 */
-    void (GLAPIENTRYP VertexAttrib3svNV) (GLuint index, const GLshort * v);     /* 822 */
-    void (GLAPIENTRYP VertexAttrib4dNV) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 823 */
-    void (GLAPIENTRYP VertexAttrib4dvNV) (GLuint index, const GLdouble * v);    /* 824 */
-    void (GLAPIENTRYP VertexAttrib4fNV) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);     /* 825 */
-    void (GLAPIENTRYP VertexAttrib4fvNV) (GLuint index, const GLfloat * v);     /* 826 */
-    void (GLAPIENTRYP VertexAttrib4sNV) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);     /* 827 */
-    void (GLAPIENTRYP VertexAttrib4svNV) (GLuint index, const GLshort * v);     /* 828 */
-    void (GLAPIENTRYP VertexAttrib4ubNV) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);    /* 829 */
-    void (GLAPIENTRYP VertexAttrib4ubvNV) (GLuint index, const GLubyte * v);    /* 830 */
-    void (GLAPIENTRYP VertexAttribPointerNV) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer);   /* 831 */
-    void (GLAPIENTRYP VertexAttribs1dvNV) (GLuint index, GLsizei n, const GLdouble * v);        /* 832 */
-    void (GLAPIENTRYP VertexAttribs1fvNV) (GLuint index, GLsizei n, const GLfloat * v); /* 833 */
-    void (GLAPIENTRYP VertexAttribs1svNV) (GLuint index, GLsizei n, const GLshort * v); /* 834 */
-    void (GLAPIENTRYP VertexAttribs2dvNV) (GLuint index, GLsizei n, const GLdouble * v);        /* 835 */
-    void (GLAPIENTRYP VertexAttribs2fvNV) (GLuint index, GLsizei n, const GLfloat * v); /* 836 */
-    void (GLAPIENTRYP VertexAttribs2svNV) (GLuint index, GLsizei n, const GLshort * v); /* 837 */
-    void (GLAPIENTRYP VertexAttribs3dvNV) (GLuint index, GLsizei n, const GLdouble * v);        /* 838 */
-    void (GLAPIENTRYP VertexAttribs3fvNV) (GLuint index, GLsizei n, const GLfloat * v); /* 839 */
-    void (GLAPIENTRYP VertexAttribs3svNV) (GLuint index, GLsizei n, const GLshort * v); /* 840 */
-    void (GLAPIENTRYP VertexAttribs4dvNV) (GLuint index, GLsizei n, const GLdouble * v);        /* 841 */
-    void (GLAPIENTRYP VertexAttribs4fvNV) (GLuint index, GLsizei n, const GLfloat * v); /* 842 */
-    void (GLAPIENTRYP VertexAttribs4svNV) (GLuint index, GLsizei n, const GLshort * v); /* 843 */
-    void (GLAPIENTRYP VertexAttribs4ubvNV) (GLuint index, GLsizei n, const GLubyte * v);        /* 844 */
-    void (GLAPIENTRYP GetTexBumpParameterfvATI) (GLenum pname, GLfloat * param);        /* 845 */
-    void (GLAPIENTRYP GetTexBumpParameterivATI) (GLenum pname, GLint * param);  /* 846 */
-    void (GLAPIENTRYP TexBumpParameterfvATI) (GLenum pname, const GLfloat * param);     /* 847 */
-    void (GLAPIENTRYP TexBumpParameterivATI) (GLenum pname, const GLint * param);       /* 848 */
-    void (GLAPIENTRYP AlphaFragmentOp1ATI) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 849 */
-    void (GLAPIENTRYP AlphaFragmentOp2ATI) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);    /* 850 */
-    void (GLAPIENTRYP AlphaFragmentOp3ATI) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);       /* 851 */
-    void (GLAPIENTRYP BeginFragmentShaderATI) (void);   /* 852 */
-    void (GLAPIENTRYP BindFragmentShaderATI) (GLuint id);       /* 853 */
-    void (GLAPIENTRYP ColorFragmentOp1ATI) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 854 */
-    void (GLAPIENTRYP ColorFragmentOp2ATI) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);    /* 855 */
-    void (GLAPIENTRYP ColorFragmentOp3ATI) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);       /* 856 */
-    void (GLAPIENTRYP DeleteFragmentShaderATI) (GLuint id);     /* 857 */
-    void (GLAPIENTRYP EndFragmentShaderATI) (void);     /* 858 */
-     GLuint(GLAPIENTRYP GenFragmentShadersATI) (GLuint range);  /* 859 */
-    void (GLAPIENTRYP PassTexCoordATI) (GLuint dst, GLuint coord, GLenum swizzle);      /* 860 */
-    void (GLAPIENTRYP SampleMapATI) (GLuint dst, GLuint interp, GLenum swizzle);        /* 861 */
-    void (GLAPIENTRYP SetFragmentShaderConstantATI) (GLuint dst, const GLfloat * value);        /* 862 */
-    void (GLAPIENTRYP PointParameteriNV) (GLenum pname, GLint param);   /* 863 */
-    void (GLAPIENTRYP PointParameterivNV) (GLenum pname, const GLint * params); /* 864 */
-    void (GLAPIENTRYP ActiveStencilFaceEXT) (GLenum face);      /* 865 */
-    void (GLAPIENTRYP BindVertexArrayAPPLE) (GLuint array);     /* 866 */
-    void (GLAPIENTRYP DeleteVertexArraysAPPLE) (GLsizei n, const GLuint * arrays);      /* 867 */
-    void (GLAPIENTRYP GenVertexArraysAPPLE) (GLsizei n, GLuint * arrays);       /* 868 */
-     GLboolean(GLAPIENTRYP IsVertexArrayAPPLE) (GLuint array);  /* 869 */
-    void (GLAPIENTRYP GetProgramNamedParameterdvNV) (GLuint id, GLsizei len, const GLubyte * name, GLdouble * params);  /* 870 */
-    void (GLAPIENTRYP GetProgramNamedParameterfvNV) (GLuint id, GLsizei len, const GLubyte * name, GLfloat * params);   /* 871 */
-    void (GLAPIENTRYP ProgramNamedParameter4dNV) (GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);        /* 872 */
-    void (GLAPIENTRYP ProgramNamedParameter4dvNV) (GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v);   /* 873 */
-    void (GLAPIENTRYP ProgramNamedParameter4fNV) (GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);    /* 874 */
-    void (GLAPIENTRYP ProgramNamedParameter4fvNV) (GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v);    /* 875 */
-    void (GLAPIENTRYP PrimitiveRestartIndexNV) (GLuint index);  /* 876 */
-    void (GLAPIENTRYP PrimitiveRestartNV) (void);       /* 877 */
-    void (GLAPIENTRYP DepthBoundsEXT) (GLclampd zmin, GLclampd zmax);   /* 878 */
-    void (GLAPIENTRYP BlendEquationSeparateEXT) (GLenum modeRGB, GLenum modeA); /* 879 */
-    void (GLAPIENTRYP BindFramebufferEXT) (GLenum target, GLuint framebuffer);  /* 880 */
-    void (GLAPIENTRYP BindRenderbufferEXT) (GLenum target, GLuint renderbuffer);        /* 881 */
-     GLenum(GLAPIENTRYP CheckFramebufferStatusEXT) (GLenum target);     /* 882 */
-    void (GLAPIENTRYP DeleteFramebuffersEXT) (GLsizei n, const GLuint * framebuffers);  /* 883 */
-    void (GLAPIENTRYP DeleteRenderbuffersEXT) (GLsizei n, const GLuint * renderbuffers);        /* 884 */
-    void (GLAPIENTRYP FramebufferRenderbufferEXT) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);   /* 885 */
-    void (GLAPIENTRYP FramebufferTexture1DEXT) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);       /* 886 */
-    void (GLAPIENTRYP FramebufferTexture2DEXT) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);       /* 887 */
-    void (GLAPIENTRYP FramebufferTexture3DEXT) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);        /* 888 */
-    void (GLAPIENTRYP GenFramebuffersEXT) (GLsizei n, GLuint * framebuffers);   /* 889 */
-    void (GLAPIENTRYP GenRenderbuffersEXT) (GLsizei n, GLuint * renderbuffers); /* 890 */
-    void (GLAPIENTRYP GenerateMipmapEXT) (GLenum target);       /* 891 */
-    void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT) (GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 892 */
-    void (GLAPIENTRYP GetRenderbufferParameterivEXT) (GLenum target, GLenum pname, GLint * params);     /* 893 */
-     GLboolean(GLAPIENTRYP IsFramebufferEXT) (GLuint framebuffer);      /* 894 */
-     GLboolean(GLAPIENTRYP IsRenderbufferEXT) (GLuint renderbuffer);    /* 895 */
-    void (GLAPIENTRYP RenderbufferStorageEXT) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);    /* 896 */
-    void (GLAPIENTRYP BlitFramebufferEXT) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);     /* 897 */
-    void (GLAPIENTRYP BufferParameteriAPPLE) (GLenum target, GLenum pname, GLint param);        /* 898 */
-    void (GLAPIENTRYP FlushMappedBufferRangeAPPLE) (GLenum target, GLintptr offset, GLsizeiptr size);   /* 899 */
-    void (GLAPIENTRYP BindFragDataLocationEXT) (GLuint program, GLuint colorNumber, const GLchar * name);       /* 900 */
-     GLint(GLAPIENTRYP GetFragDataLocationEXT) (GLuint program, const GLchar * name);   /* 901 */
-    void (GLAPIENTRYP GetUniformuivEXT) (GLuint program, GLint location, GLuint * params);      /* 902 */
-    void (GLAPIENTRYP GetVertexAttribIivEXT) (GLuint index, GLenum pname, GLint * params);      /* 903 */
-    void (GLAPIENTRYP GetVertexAttribIuivEXT) (GLuint index, GLenum pname, GLuint * params);    /* 904 */
-    void (GLAPIENTRYP Uniform1uiEXT) (GLint location, GLuint x);        /* 905 */
-    void (GLAPIENTRYP Uniform1uivEXT) (GLint location, GLsizei count, const GLuint * value);    /* 906 */
-    void (GLAPIENTRYP Uniform2uiEXT) (GLint location, GLuint x, GLuint y);      /* 907 */
-    void (GLAPIENTRYP Uniform2uivEXT) (GLint location, GLsizei count, const GLuint * value);    /* 908 */
-    void (GLAPIENTRYP Uniform3uiEXT) (GLint location, GLuint x, GLuint y, GLuint z);    /* 909 */
-    void (GLAPIENTRYP Uniform3uivEXT) (GLint location, GLsizei count, const GLuint * value);    /* 910 */
-    void (GLAPIENTRYP Uniform4uiEXT) (GLint location, GLuint x, GLuint y, GLuint z, GLuint w);  /* 911 */
-    void (GLAPIENTRYP Uniform4uivEXT) (GLint location, GLsizei count, const GLuint * value);    /* 912 */
-    void (GLAPIENTRYP VertexAttribI1iEXT) (GLuint index, GLint x);      /* 913 */
-    void (GLAPIENTRYP VertexAttribI1ivEXT) (GLuint index, const GLint * v);     /* 914 */
-    void (GLAPIENTRYP VertexAttribI1uiEXT) (GLuint index, GLuint x);    /* 915 */
-    void (GLAPIENTRYP VertexAttribI1uivEXT) (GLuint index, const GLuint * v);   /* 916 */
-    void (GLAPIENTRYP VertexAttribI2iEXT) (GLuint index, GLint x, GLint y);     /* 917 */
-    void (GLAPIENTRYP VertexAttribI2ivEXT) (GLuint index, const GLint * v);     /* 918 */
-    void (GLAPIENTRYP VertexAttribI2uiEXT) (GLuint index, GLuint x, GLuint y);  /* 919 */
-    void (GLAPIENTRYP VertexAttribI2uivEXT) (GLuint index, const GLuint * v);   /* 920 */
-    void (GLAPIENTRYP VertexAttribI3iEXT) (GLuint index, GLint x, GLint y, GLint z);    /* 921 */
-    void (GLAPIENTRYP VertexAttribI3ivEXT) (GLuint index, const GLint * v);     /* 922 */
-    void (GLAPIENTRYP VertexAttribI3uiEXT) (GLuint index, GLuint x, GLuint y, GLuint z);        /* 923 */
-    void (GLAPIENTRYP VertexAttribI3uivEXT) (GLuint index, const GLuint * v);   /* 924 */
-    void (GLAPIENTRYP VertexAttribI4bvEXT) (GLuint index, const GLbyte * v);    /* 925 */
-    void (GLAPIENTRYP VertexAttribI4iEXT) (GLuint index, GLint x, GLint y, GLint z, GLint w);   /* 926 */
-    void (GLAPIENTRYP VertexAttribI4ivEXT) (GLuint index, const GLint * v);     /* 927 */
-    void (GLAPIENTRYP VertexAttribI4svEXT) (GLuint index, const GLshort * v);   /* 928 */
-    void (GLAPIENTRYP VertexAttribI4ubvEXT) (GLuint index, const GLubyte * v);  /* 929 */
-    void (GLAPIENTRYP VertexAttribI4uiEXT) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);      /* 930 */
-    void (GLAPIENTRYP VertexAttribI4uivEXT) (GLuint index, const GLuint * v);   /* 931 */
-    void (GLAPIENTRYP VertexAttribI4usvEXT) (GLuint index, const GLushort * v); /* 932 */
-    void (GLAPIENTRYP VertexAttribIPointerEXT) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 933 */
-    void (GLAPIENTRYP FramebufferTextureLayerEXT) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 934 */
-    void (GLAPIENTRYP ColorMaskIndexedEXT) (GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a);    /* 935 */
-    void (GLAPIENTRYP DisableIndexedEXT) (GLenum target, GLuint index); /* 936 */
-    void (GLAPIENTRYP EnableIndexedEXT) (GLenum target, GLuint index);  /* 937 */
-    void (GLAPIENTRYP GetBooleanIndexedvEXT) (GLenum value, GLuint index, GLboolean * data);    /* 938 */
-    void (GLAPIENTRYP GetIntegerIndexedvEXT) (GLenum value, GLuint index, GLint * data);        /* 939 */
-     GLboolean(GLAPIENTRYP IsEnabledIndexedEXT) (GLenum target, GLuint index);  /* 940 */
-    void (GLAPIENTRYP ClearColorIiEXT) (GLint r, GLint g, GLint b, GLint a);    /* 941 */
-    void (GLAPIENTRYP ClearColorIuiEXT) (GLuint r, GLuint g, GLuint b, GLuint a);       /* 942 */
-    void (GLAPIENTRYP GetTexParameterIivEXT) (GLenum target, GLenum pname, GLint * params);     /* 943 */
-    void (GLAPIENTRYP GetTexParameterIuivEXT) (GLenum target, GLenum pname, GLuint * params);   /* 944 */
-    void (GLAPIENTRYP TexParameterIivEXT) (GLenum target, GLenum pname, const GLint * params);  /* 945 */
-    void (GLAPIENTRYP TexParameterIuivEXT) (GLenum target, GLenum pname, const GLuint * params);        /* 946 */
-    void (GLAPIENTRYP BeginConditionalRenderNV) (GLuint query, GLenum mode);    /* 947 */
-    void (GLAPIENTRYP EndConditionalRenderNV) (void);   /* 948 */
-    void (GLAPIENTRYP BeginTransformFeedbackEXT) (GLenum mode); /* 949 */
-    void (GLAPIENTRYP BindBufferBaseEXT) (GLenum target, GLuint index, GLuint buffer);  /* 950 */
-    void (GLAPIENTRYP BindBufferOffsetEXT) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);       /* 951 */
-    void (GLAPIENTRYP BindBufferRangeEXT) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);       /* 952 */
-    void (GLAPIENTRYP EndTransformFeedbackEXT) (void);  /* 953 */
-    void (GLAPIENTRYP GetTransformFeedbackVaryingEXT) (GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name);  /* 954 */
-    void (GLAPIENTRYP TransformFeedbackVaryingsEXT) (GLuint program, GLsizei count, const char **varyings, GLenum bufferMode);  /* 955 */
-    void (GLAPIENTRYP ProvokingVertexEXT) (GLenum mode);        /* 956 */
-    void (GLAPIENTRYP GetTexParameterPointervAPPLE) (GLenum target, GLenum pname, GLvoid ** params);    /* 957 */
-    void (GLAPIENTRYP TextureRangeAPPLE) (GLenum target, GLsizei length, GLvoid * pointer);     /* 958 */
-    void (GLAPIENTRYP GetObjectParameterivAPPLE) (GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 959 */
-     GLenum(GLAPIENTRYP ObjectPurgeableAPPLE) (GLenum objectType, GLuint name, GLenum option);  /* 960 */
-     GLenum(GLAPIENTRYP ObjectUnpurgeableAPPLE) (GLenum objectType, GLuint name, GLenum option);        /* 961 */
-    void (GLAPIENTRYP ActiveProgramEXT) (GLuint program);       /* 962 */
-     GLuint(GLAPIENTRYP CreateShaderProgramEXT) (GLenum type, const GLchar * string);   /* 963 */
-    void (GLAPIENTRYP UseShaderProgramEXT) (GLenum type, GLuint program);       /* 964 */
-    void (GLAPIENTRYP TextureBarrierNV) (void); /* 965 */
-    void (GLAPIENTRYP StencilFuncSeparateATI) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);      /* 966 */
-    void (GLAPIENTRYP ProgramEnvParameters4fvEXT) (GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 967 */
-    void (GLAPIENTRYP ProgramLocalParameters4fvEXT) (GLenum target, GLuint index, GLsizei count, const GLfloat * params);       /* 968 */
-    void (GLAPIENTRYP GetQueryObjecti64vEXT) (GLuint id, GLenum pname, GLint64EXT * params);    /* 969 */
-    void (GLAPIENTRYP GetQueryObjectui64vEXT) (GLuint id, GLenum pname, GLuint64EXT * params);  /* 970 */
-    void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES) (GLenum target, GLvoid * writeOffset);      /* 971 */
-    void (GLAPIENTRYP EGLImageTargetTexture2DOES) (GLenum target, GLvoid * writeOffset);        /* 972 */
-};
-
-#endif                          /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/xorg-server/glx/glprocs.h b/xorg-server/glx/glprocs.h
deleted file mode 100644
index 87063642c..000000000
--- a/xorg-server/glx/glprocs.h
+++ /dev/null
@@ -1,3534 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by gl_procs.py (from Mesa) script */
-
-/*
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
- * (C) Copyright IBM Corporation 2004, 2006
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL, IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* This file is only included by glapi.c and is used for
- * the GetProcAddress() function
- */
-
-typedef struct {
-    GLint Name_offset;
-#if defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING)
-    _glapi_proc Address;
-#endif
-    GLuint Offset;
-} glprocs_table_t;
-
-#if   !defined(NEED_FUNCTION_POINTER) && !defined(GLX_INDIRECT_RENDERING)
-#define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , o }
-#elif  defined(NEED_FUNCTION_POINTER) && !defined(GLX_INDIRECT_RENDERING)
-#define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f1 , o }
-#elif  defined(NEED_FUNCTION_POINTER) &&  defined(GLX_INDIRECT_RENDERING)
-#define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f2 , o }
-#elif !defined(NEED_FUNCTION_POINTER) &&  defined(GLX_INDIRECT_RENDERING)
-#define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f3 , o }
-#endif
-
-static const char gl_string_table[] =
-    "glNewList\0"
-    "glEndList\0"
-    "glCallList\0"
-    "glCallLists\0"
-    "glDeleteLists\0"
-    "glGenLists\0"
-    "glListBase\0"
-    "glBegin\0"
-    "glBitmap\0"
-    "glColor3b\0"
-    "glColor3bv\0"
-    "glColor3d\0"
-    "glColor3dv\0"
-    "glColor3f\0"
-    "glColor3fv\0"
-    "glColor3i\0"
-    "glColor3iv\0"
-    "glColor3s\0"
-    "glColor3sv\0"
-    "glColor3ub\0"
-    "glColor3ubv\0"
-    "glColor3ui\0"
-    "glColor3uiv\0"
-    "glColor3us\0"
-    "glColor3usv\0"
-    "glColor4b\0"
-    "glColor4bv\0"
-    "glColor4d\0"
-    "glColor4dv\0"
-    "glColor4f\0"
-    "glColor4fv\0"
-    "glColor4i\0"
-    "glColor4iv\0"
-    "glColor4s\0"
-    "glColor4sv\0"
-    "glColor4ub\0"
-    "glColor4ubv\0"
-    "glColor4ui\0"
-    "glColor4uiv\0"
-    "glColor4us\0"
-    "glColor4usv\0"
-    "glEdgeFlag\0"
-    "glEdgeFlagv\0"
-    "glEnd\0"
-    "glIndexd\0"
-    "glIndexdv\0"
-    "glIndexf\0"
-    "glIndexfv\0"
-    "glIndexi\0"
-    "glIndexiv\0"
-    "glIndexs\0"
-    "glIndexsv\0"
-    "glNormal3b\0"
-    "glNormal3bv\0"
-    "glNormal3d\0"
-    "glNormal3dv\0"
-    "glNormal3f\0"
-    "glNormal3fv\0"
-    "glNormal3i\0"
-    "glNormal3iv\0"
-    "glNormal3s\0"
-    "glNormal3sv\0"
-    "glRasterPos2d\0"
-    "glRasterPos2dv\0"
-    "glRasterPos2f\0"
-    "glRasterPos2fv\0"
-    "glRasterPos2i\0"
-    "glRasterPos2iv\0"
-    "glRasterPos2s\0"
-    "glRasterPos2sv\0"
-    "glRasterPos3d\0"
-    "glRasterPos3dv\0"
-    "glRasterPos3f\0"
-    "glRasterPos3fv\0"
-    "glRasterPos3i\0"
-    "glRasterPos3iv\0"
-    "glRasterPos3s\0"
-    "glRasterPos3sv\0"
-    "glRasterPos4d\0"
-    "glRasterPos4dv\0"
-    "glRasterPos4f\0"
-    "glRasterPos4fv\0"
-    "glRasterPos4i\0"
-    "glRasterPos4iv\0"
-    "glRasterPos4s\0"
-    "glRasterPos4sv\0"
-    "glRectd\0"
-    "glRectdv\0"
-    "glRectf\0"
-    "glRectfv\0"
-    "glRecti\0"
-    "glRectiv\0"
-    "glRects\0"
-    "glRectsv\0"
-    "glTexCoord1d\0"
-    "glTexCoord1dv\0"
-    "glTexCoord1f\0"
-    "glTexCoord1fv\0"
-    "glTexCoord1i\0"
-    "glTexCoord1iv\0"
-    "glTexCoord1s\0"
-    "glTexCoord1sv\0"
-    "glTexCoord2d\0"
-    "glTexCoord2dv\0"
-    "glTexCoord2f\0"
-    "glTexCoord2fv\0"
-    "glTexCoord2i\0"
-    "glTexCoord2iv\0"
-    "glTexCoord2s\0"
-    "glTexCoord2sv\0"
-    "glTexCoord3d\0"
-    "glTexCoord3dv\0"
-    "glTexCoord3f\0"
-    "glTexCoord3fv\0"
-    "glTexCoord3i\0"
-    "glTexCoord3iv\0"
-    "glTexCoord3s\0"
-    "glTexCoord3sv\0"
-    "glTexCoord4d\0"
-    "glTexCoord4dv\0"
-    "glTexCoord4f\0"
-    "glTexCoord4fv\0"
-    "glTexCoord4i\0"
-    "glTexCoord4iv\0"
-    "glTexCoord4s\0"
-    "glTexCoord4sv\0"
-    "glVertex2d\0"
-    "glVertex2dv\0"
-    "glVertex2f\0"
-    "glVertex2fv\0"
-    "glVertex2i\0"
-    "glVertex2iv\0"
-    "glVertex2s\0"
-    "glVertex2sv\0"
-    "glVertex3d\0"
-    "glVertex3dv\0"
-    "glVertex3f\0"
-    "glVertex3fv\0"
-    "glVertex3i\0"
-    "glVertex3iv\0"
-    "glVertex3s\0"
-    "glVertex3sv\0"
-    "glVertex4d\0"
-    "glVertex4dv\0"
-    "glVertex4f\0"
-    "glVertex4fv\0"
-    "glVertex4i\0"
-    "glVertex4iv\0"
-    "glVertex4s\0"
-    "glVertex4sv\0"
-    "glClipPlane\0"
-    "glColorMaterial\0"
-    "glCullFace\0"
-    "glFogf\0"
-    "glFogfv\0"
-    "glFogi\0"
-    "glFogiv\0"
-    "glFrontFace\0"
-    "glHint\0"
-    "glLightf\0"
-    "glLightfv\0"
-    "glLighti\0"
-    "glLightiv\0"
-    "glLightModelf\0"
-    "glLightModelfv\0"
-    "glLightModeli\0"
-    "glLightModeliv\0"
-    "glLineStipple\0"
-    "glLineWidth\0"
-    "glMaterialf\0"
-    "glMaterialfv\0"
-    "glMateriali\0"
-    "glMaterialiv\0"
-    "glPointSize\0"
-    "glPolygonMode\0"
-    "glPolygonStipple\0"
-    "glScissor\0"
-    "glShadeModel\0"
-    "glTexParameterf\0"
-    "glTexParameterfv\0"
-    "glTexParameteri\0"
-    "glTexParameteriv\0"
-    "glTexImage1D\0"
-    "glTexImage2D\0"
-    "glTexEnvf\0"
-    "glTexEnvfv\0"
-    "glTexEnvi\0"
-    "glTexEnviv\0"
-    "glTexGend\0"
-    "glTexGendv\0"
-    "glTexGenf\0"
-    "glTexGenfv\0"
-    "glTexGeni\0"
-    "glTexGeniv\0"
-    "glFeedbackBuffer\0"
-    "glSelectBuffer\0"
-    "glRenderMode\0"
-    "glInitNames\0"
-    "glLoadName\0"
-    "glPassThrough\0"
-    "glPopName\0"
-    "glPushName\0"
-    "glDrawBuffer\0"
-    "glClear\0"
-    "glClearAccum\0"
-    "glClearIndex\0"
-    "glClearColor\0"
-    "glClearStencil\0"
-    "glClearDepth\0"
-    "glStencilMask\0"
-    "glColorMask\0"
-    "glDepthMask\0"
-    "glIndexMask\0"
-    "glAccum\0"
-    "glDisable\0"
-    "glEnable\0"
-    "glFinish\0"
-    "glFlush\0"
-    "glPopAttrib\0"
-    "glPushAttrib\0"
-    "glMap1d\0"
-    "glMap1f\0"
-    "glMap2d\0"
-    "glMap2f\0"
-    "glMapGrid1d\0"
-    "glMapGrid1f\0"
-    "glMapGrid2d\0"
-    "glMapGrid2f\0"
-    "glEvalCoord1d\0"
-    "glEvalCoord1dv\0"
-    "glEvalCoord1f\0"
-    "glEvalCoord1fv\0"
-    "glEvalCoord2d\0"
-    "glEvalCoord2dv\0"
-    "glEvalCoord2f\0"
-    "glEvalCoord2fv\0"
-    "glEvalMesh1\0"
-    "glEvalPoint1\0"
-    "glEvalMesh2\0"
-    "glEvalPoint2\0"
-    "glAlphaFunc\0"
-    "glBlendFunc\0"
-    "glLogicOp\0"
-    "glStencilFunc\0"
-    "glStencilOp\0"
-    "glDepthFunc\0"
-    "glPixelZoom\0"
-    "glPixelTransferf\0"
-    "glPixelTransferi\0"
-    "glPixelStoref\0"
-    "glPixelStorei\0"
-    "glPixelMapfv\0"
-    "glPixelMapuiv\0"
-    "glPixelMapusv\0"
-    "glReadBuffer\0"
-    "glCopyPixels\0"
-    "glReadPixels\0"
-    "glDrawPixels\0"
-    "glGetBooleanv\0"
-    "glGetClipPlane\0"
-    "glGetDoublev\0"
-    "glGetError\0"
-    "glGetFloatv\0"
-    "glGetIntegerv\0"
-    "glGetLightfv\0"
-    "glGetLightiv\0"
-    "glGetMapdv\0"
-    "glGetMapfv\0"
-    "glGetMapiv\0"
-    "glGetMaterialfv\0"
-    "glGetMaterialiv\0"
-    "glGetPixelMapfv\0"
-    "glGetPixelMapuiv\0"
-    "glGetPixelMapusv\0"
-    "glGetPolygonStipple\0"
-    "glGetString\0"
-    "glGetTexEnvfv\0"
-    "glGetTexEnviv\0"
-    "glGetTexGendv\0"
-    "glGetTexGenfv\0"
-    "glGetTexGeniv\0"
-    "glGetTexImage\0"
-    "glGetTexParameterfv\0"
-    "glGetTexParameteriv\0"
-    "glGetTexLevelParameterfv\0"
-    "glGetTexLevelParameteriv\0"
-    "glIsEnabled\0"
-    "glIsList\0"
-    "glDepthRange\0"
-    "glFrustum\0"
-    "glLoadIdentity\0"
-    "glLoadMatrixf\0"
-    "glLoadMatrixd\0"
-    "glMatrixMode\0"
-    "glMultMatrixf\0"
-    "glMultMatrixd\0"
-    "glOrtho\0"
-    "glPopMatrix\0"
-    "glPushMatrix\0"
-    "glRotated\0"
-    "glRotatef\0"
-    "glScaled\0"
-    "glScalef\0"
-    "glTranslated\0"
-    "glTranslatef\0"
-    "glViewport\0"
-    "glArrayElement\0"
-    "glBindTexture\0"
-    "glColorPointer\0"
-    "glDisableClientState\0"
-    "glDrawArrays\0"
-    "glDrawElements\0"
-    "glEdgeFlagPointer\0"
-    "glEnableClientState\0"
-    "glIndexPointer\0"
-    "glIndexub\0"
-    "glIndexubv\0"
-    "glInterleavedArrays\0"
-    "glNormalPointer\0"
-    "glPolygonOffset\0"
-    "glTexCoordPointer\0"
-    "glVertexPointer\0"
-    "glAreTexturesResident\0"
-    "glCopyTexImage1D\0"
-    "glCopyTexImage2D\0"
-    "glCopyTexSubImage1D\0"
-    "glCopyTexSubImage2D\0"
-    "glDeleteTextures\0"
-    "glGenTextures\0"
-    "glGetPointerv\0"
-    "glIsTexture\0"
-    "glPrioritizeTextures\0"
-    "glTexSubImage1D\0"
-    "glTexSubImage2D\0"
-    "glPopClientAttrib\0"
-    "glPushClientAttrib\0"
-    "glBlendColor\0"
-    "glBlendEquation\0"
-    "glDrawRangeElements\0"
-    "glColorTable\0"
-    "glColorTableParameterfv\0"
-    "glColorTableParameteriv\0"
-    "glCopyColorTable\0"
-    "glGetColorTable\0"
-    "glGetColorTableParameterfv\0"
-    "glGetColorTableParameteriv\0"
-    "glColorSubTable\0"
-    "glCopyColorSubTable\0"
-    "glConvolutionFilter1D\0"
-    "glConvolutionFilter2D\0"
-    "glConvolutionParameterf\0"
-    "glConvolutionParameterfv\0"
-    "glConvolutionParameteri\0"
-    "glConvolutionParameteriv\0"
-    "glCopyConvolutionFilter1D\0"
-    "glCopyConvolutionFilter2D\0"
-    "glGetConvolutionFilter\0"
-    "glGetConvolutionParameterfv\0"
-    "glGetConvolutionParameteriv\0"
-    "glGetSeparableFilter\0"
-    "glSeparableFilter2D\0"
-    "glGetHistogram\0"
-    "glGetHistogramParameterfv\0"
-    "glGetHistogramParameteriv\0"
-    "glGetMinmax\0"
-    "glGetMinmaxParameterfv\0"
-    "glGetMinmaxParameteriv\0"
-    "glHistogram\0"
-    "glMinmax\0"
-    "glResetHistogram\0"
-    "glResetMinmax\0"
-    "glTexImage3D\0"
-    "glTexSubImage3D\0"
-    "glCopyTexSubImage3D\0"
-    "glActiveTextureARB\0"
-    "glClientActiveTextureARB\0"
-    "glMultiTexCoord1dARB\0"
-    "glMultiTexCoord1dvARB\0"
-    "glMultiTexCoord1fARB\0"
-    "glMultiTexCoord1fvARB\0"
-    "glMultiTexCoord1iARB\0"
-    "glMultiTexCoord1ivARB\0"
-    "glMultiTexCoord1sARB\0"
-    "glMultiTexCoord1svARB\0"
-    "glMultiTexCoord2dARB\0"
-    "glMultiTexCoord2dvARB\0"
-    "glMultiTexCoord2fARB\0"
-    "glMultiTexCoord2fvARB\0"
-    "glMultiTexCoord2iARB\0"
-    "glMultiTexCoord2ivARB\0"
-    "glMultiTexCoord2sARB\0"
-    "glMultiTexCoord2svARB\0"
-    "glMultiTexCoord3dARB\0"
-    "glMultiTexCoord3dvARB\0"
-    "glMultiTexCoord3fARB\0"
-    "glMultiTexCoord3fvARB\0"
-    "glMultiTexCoord3iARB\0"
-    "glMultiTexCoord3ivARB\0"
-    "glMultiTexCoord3sARB\0"
-    "glMultiTexCoord3svARB\0"
-    "glMultiTexCoord4dARB\0"
-    "glMultiTexCoord4dvARB\0"
-    "glMultiTexCoord4fARB\0"
-    "glMultiTexCoord4fvARB\0"
-    "glMultiTexCoord4iARB\0"
-    "glMultiTexCoord4ivARB\0"
-    "glMultiTexCoord4sARB\0"
-    "glMultiTexCoord4svARB\0"
-    "glAttachShader\0"
-    "glCreateProgram\0"
-    "glCreateShader\0"
-    "glDeleteProgram\0"
-    "glDeleteShader\0"
-    "glDetachShader\0"
-    "glGetAttachedShaders\0"
-    "glGetProgramInfoLog\0"
-    "glGetProgramiv\0"
-    "glGetShaderInfoLog\0"
-    "glGetShaderiv\0"
-    "glIsProgram\0"
-    "glIsShader\0"
-    "glStencilFuncSeparate\0"
-    "glStencilMaskSeparate\0"
-    "glStencilOpSeparate\0"
-    "glUniformMatrix2x3fv\0"
-    "glUniformMatrix2x4fv\0"
-    "glUniformMatrix3x2fv\0"
-    "glUniformMatrix3x4fv\0"
-    "glUniformMatrix4x2fv\0"
-    "glUniformMatrix4x3fv\0"
-    "glClampColor\0"
-    "glClearBufferfi\0"
-    "glClearBufferfv\0"
-    "glClearBufferiv\0"
-    "glClearBufferuiv\0"
-    "glGetStringi\0"
-    "glTexBuffer\0"
-    "glFramebufferTexture\0"
-    "glGetBufferParameteri64v\0"
-    "glGetInteger64i_v\0"
-    "glVertexAttribDivisor\0"
-    "glLoadTransposeMatrixdARB\0"
-    "glLoadTransposeMatrixfARB\0"
-    "glMultTransposeMatrixdARB\0"
-    "glMultTransposeMatrixfARB\0"
-    "glSampleCoverageARB\0"
-    "glCompressedTexImage1DARB\0"
-    "glCompressedTexImage2DARB\0"
-    "glCompressedTexImage3DARB\0"
-    "glCompressedTexSubImage1DARB\0"
-    "glCompressedTexSubImage2DARB\0"
-    "glCompressedTexSubImage3DARB\0"
-    "glGetCompressedTexImageARB\0"
-    "glDisableVertexAttribArrayARB\0"
-    "glEnableVertexAttribArrayARB\0"
-    "glGetProgramEnvParameterdvARB\0"
-    "glGetProgramEnvParameterfvARB\0"
-    "glGetProgramLocalParameterdvARB\0"
-    "glGetProgramLocalParameterfvARB\0"
-    "glGetProgramStringARB\0"
-    "glGetProgramivARB\0"
-    "glGetVertexAttribdvARB\0"
-    "glGetVertexAttribfvARB\0"
-    "glGetVertexAttribivARB\0"
-    "glProgramEnvParameter4dARB\0"
-    "glProgramEnvParameter4dvARB\0"
-    "glProgramEnvParameter4fARB\0"
-    "glProgramEnvParameter4fvARB\0"
-    "glProgramLocalParameter4dARB\0"
-    "glProgramLocalParameter4dvARB\0"
-    "glProgramLocalParameter4fARB\0"
-    "glProgramLocalParameter4fvARB\0"
-    "glProgramStringARB\0"
-    "glVertexAttrib1dARB\0"
-    "glVertexAttrib1dvARB\0"
-    "glVertexAttrib1fARB\0"
-    "glVertexAttrib1fvARB\0"
-    "glVertexAttrib1sARB\0"
-    "glVertexAttrib1svARB\0"
-    "glVertexAttrib2dARB\0"
-    "glVertexAttrib2dvARB\0"
-    "glVertexAttrib2fARB\0"
-    "glVertexAttrib2fvARB\0"
-    "glVertexAttrib2sARB\0"
-    "glVertexAttrib2svARB\0"
-    "glVertexAttrib3dARB\0"
-    "glVertexAttrib3dvARB\0"
-    "glVertexAttrib3fARB\0"
-    "glVertexAttrib3fvARB\0"
-    "glVertexAttrib3sARB\0"
-    "glVertexAttrib3svARB\0"
-    "glVertexAttrib4NbvARB\0"
-    "glVertexAttrib4NivARB\0"
-    "glVertexAttrib4NsvARB\0"
-    "glVertexAttrib4NubARB\0"
-    "glVertexAttrib4NubvARB\0"
-    "glVertexAttrib4NuivARB\0"
-    "glVertexAttrib4NusvARB\0"
-    "glVertexAttrib4bvARB\0"
-    "glVertexAttrib4dARB\0"
-    "glVertexAttrib4dvARB\0"
-    "glVertexAttrib4fARB\0"
-    "glVertexAttrib4fvARB\0"
-    "glVertexAttrib4ivARB\0"
-    "glVertexAttrib4sARB\0"
-    "glVertexAttrib4svARB\0"
-    "glVertexAttrib4ubvARB\0"
-    "glVertexAttrib4uivARB\0"
-    "glVertexAttrib4usvARB\0"
-    "glVertexAttribPointerARB\0"
-    "glBindBufferARB\0"
-    "glBufferDataARB\0"
-    "glBufferSubDataARB\0"
-    "glDeleteBuffersARB\0"
-    "glGenBuffersARB\0"
-    "glGetBufferParameterivARB\0"
-    "glGetBufferPointervARB\0"
-    "glGetBufferSubDataARB\0"
-    "glIsBufferARB\0"
-    "glMapBufferARB\0"
-    "glUnmapBufferARB\0"
-    "glBeginQueryARB\0"
-    "glDeleteQueriesARB\0"
-    "glEndQueryARB\0"
-    "glGenQueriesARB\0"
-    "glGetQueryObjectivARB\0"
-    "glGetQueryObjectuivARB\0"
-    "glGetQueryivARB\0"
-    "glIsQueryARB\0"
-    "glAttachObjectARB\0"
-    "glCompileShaderARB\0"
-    "glCreateProgramObjectARB\0"
-    "glCreateShaderObjectARB\0"
-    "glDeleteObjectARB\0"
-    "glDetachObjectARB\0"
-    "glGetActiveUniformARB\0"
-    "glGetAttachedObjectsARB\0"
-    "glGetHandleARB\0"
-    "glGetInfoLogARB\0"
-    "glGetObjectParameterfvARB\0"
-    "glGetObjectParameterivARB\0"
-    "glGetShaderSourceARB\0"
-    "glGetUniformLocationARB\0"
-    "glGetUniformfvARB\0"
-    "glGetUniformivARB\0"
-    "glLinkProgramARB\0"
-    "glShaderSourceARB\0"
-    "glUniform1fARB\0"
-    "glUniform1fvARB\0"
-    "glUniform1iARB\0"
-    "glUniform1ivARB\0"
-    "glUniform2fARB\0"
-    "glUniform2fvARB\0"
-    "glUniform2iARB\0"
-    "glUniform2ivARB\0"
-    "glUniform3fARB\0"
-    "glUniform3fvARB\0"
-    "glUniform3iARB\0"
-    "glUniform3ivARB\0"
-    "glUniform4fARB\0"
-    "glUniform4fvARB\0"
-    "glUniform4iARB\0"
-    "glUniform4ivARB\0"
-    "glUniformMatrix2fvARB\0"
-    "glUniformMatrix3fvARB\0"
-    "glUniformMatrix4fvARB\0"
-    "glUseProgramObjectARB\0"
-    "glValidateProgramARB\0"
-    "glBindAttribLocationARB\0"
-    "glGetActiveAttribARB\0"
-    "glGetAttribLocationARB\0"
-    "glDrawBuffersARB\0"
-    "glClampColorARB\0"
-    "glDrawArraysInstancedARB\0"
-    "glDrawElementsInstancedARB\0"
-    "glRenderbufferStorageMultisample\0"
-    "glFramebufferTextureARB\0"
-    "glFramebufferTextureFaceARB\0"
-    "glProgramParameteriARB\0"
-    "glVertexAttribDivisorARB\0"
-    "glFlushMappedBufferRange\0"
-    "glMapBufferRange\0"
-    "glTexBufferARB\0"
-    "glBindVertexArray\0"
-    "glGenVertexArrays\0"
-    "glCopyBufferSubData\0"
-    "glClientWaitSync\0"
-    "glDeleteSync\0"
-    "glFenceSync\0"
-    "glGetInteger64v\0"
-    "glGetSynciv\0"
-    "glIsSync\0"
-    "glWaitSync\0"
-    "glDrawElementsBaseVertex\0"
-    "glDrawElementsInstancedBaseVertex\0"
-    "glDrawRangeElementsBaseVertex\0"
-    "glMultiDrawElementsBaseVertex\0"
-    "glBlendEquationSeparateiARB\0"
-    "glBlendEquationiARB\0"
-    "glBlendFuncSeparateiARB\0"
-    "glBlendFunciARB\0"
-    "glBindSampler\0"
-    "glDeleteSamplers\0"
-    "glGenSamplers\0"
-    "glGetSamplerParameterIiv\0"
-    "glGetSamplerParameterIuiv\0"
-    "glGetSamplerParameterfv\0"
-    "glGetSamplerParameteriv\0"
-    "glIsSampler\0"
-    "glSamplerParameterIiv\0"
-    "glSamplerParameterIuiv\0"
-    "glSamplerParameterf\0"
-    "glSamplerParameterfv\0"
-    "glSamplerParameteri\0"
-    "glSamplerParameteriv\0"
-    "glColorP3ui\0"
-    "glColorP3uiv\0"
-    "glColorP4ui\0"
-    "glColorP4uiv\0"
-    "glMultiTexCoordP1ui\0"
-    "glMultiTexCoordP1uiv\0"
-    "glMultiTexCoordP2ui\0"
-    "glMultiTexCoordP2uiv\0"
-    "glMultiTexCoordP3ui\0"
-    "glMultiTexCoordP3uiv\0"
-    "glMultiTexCoordP4ui\0"
-    "glMultiTexCoordP4uiv\0"
-    "glNormalP3ui\0"
-    "glNormalP3uiv\0"
-    "glSecondaryColorP3ui\0"
-    "glSecondaryColorP3uiv\0"
-    "glTexCoordP1ui\0"
-    "glTexCoordP1uiv\0"
-    "glTexCoordP2ui\0"
-    "glTexCoordP2uiv\0"
-    "glTexCoordP3ui\0"
-    "glTexCoordP3uiv\0"
-    "glTexCoordP4ui\0"
-    "glTexCoordP4uiv\0"
-    "glVertexAttribP1ui\0"
-    "glVertexAttribP1uiv\0"
-    "glVertexAttribP2ui\0"
-    "glVertexAttribP2uiv\0"
-    "glVertexAttribP3ui\0"
-    "glVertexAttribP3uiv\0"
-    "glVertexAttribP4ui\0"
-    "glVertexAttribP4uiv\0"
-    "glVertexP2ui\0"
-    "glVertexP2uiv\0"
-    "glVertexP3ui\0"
-    "glVertexP3uiv\0"
-    "glVertexP4ui\0"
-    "glVertexP4uiv\0"
-    "glBindTransformFeedback\0"
-    "glDeleteTransformFeedbacks\0"
-    "glDrawTransformFeedback\0"
-    "glGenTransformFeedbacks\0"
-    "glIsTransformFeedback\0"
-    "glPauseTransformFeedback\0"
-    "glResumeTransformFeedback\0"
-    "glClearDepthf\0"
-    "glDepthRangef\0"
-    "glGetShaderPrecisionFormat\0"
-    "glReleaseShaderCompiler\0"
-    "glShaderBinary\0"
-    "glGetGraphicsResetStatusARB\0"
-    "glGetnColorTableARB\0"
-    "glGetnCompressedTexImageARB\0"
-    "glGetnConvolutionFilterARB\0"
-    "glGetnHistogramARB\0"
-    "glGetnMapdvARB\0"
-    "glGetnMapfvARB\0"
-    "glGetnMapivARB\0"
-    "glGetnMinmaxARB\0"
-    "glGetnPixelMapfvARB\0"
-    "glGetnPixelMapuivARB\0"
-    "glGetnPixelMapusvARB\0"
-    "glGetnPolygonStippleARB\0"
-    "glGetnSeparableFilterARB\0"
-    "glGetnTexImageARB\0"
-    "glGetnUniformdvARB\0"
-    "glGetnUniformfvARB\0"
-    "glGetnUniformivARB\0"
-    "glGetnUniformuivARB\0"
-    "glReadnPixelsARB\0"
-    "glTexStorage1D\0"
-    "glTexStorage2D\0"
-    "glTexStorage3D\0"
-    "glTextureStorage1DEXT\0"
-    "glTextureStorage2DEXT\0"
-    "glTextureStorage3DEXT\0"
-    "glPolygonOffsetEXT\0"
-    "glGetPixelTexGenParameterfvSGIS\0"
-    "glGetPixelTexGenParameterivSGIS\0"
-    "glPixelTexGenParameterfSGIS\0"
-    "glPixelTexGenParameterfvSGIS\0"
-    "glPixelTexGenParameteriSGIS\0"
-    "glPixelTexGenParameterivSGIS\0"
-    "glSampleMaskSGIS\0"
-    "glSamplePatternSGIS\0"
-    "glColorPointerEXT\0"
-    "glEdgeFlagPointerEXT\0"
-    "glIndexPointerEXT\0"
-    "glNormalPointerEXT\0"
-    "glTexCoordPointerEXT\0"
-    "glVertexPointerEXT\0"
-    "glPointParameterfEXT\0"
-    "glPointParameterfvEXT\0"
-    "glLockArraysEXT\0"
-    "glUnlockArraysEXT\0"
-    "glSecondaryColor3bEXT\0"
-    "glSecondaryColor3bvEXT\0"
-    "glSecondaryColor3dEXT\0"
-    "glSecondaryColor3dvEXT\0"
-    "glSecondaryColor3fEXT\0"
-    "glSecondaryColor3fvEXT\0"
-    "glSecondaryColor3iEXT\0"
-    "glSecondaryColor3ivEXT\0"
-    "glSecondaryColor3sEXT\0"
-    "glSecondaryColor3svEXT\0"
-    "glSecondaryColor3ubEXT\0"
-    "glSecondaryColor3ubvEXT\0"
-    "glSecondaryColor3uiEXT\0"
-    "glSecondaryColor3uivEXT\0"
-    "glSecondaryColor3usEXT\0"
-    "glSecondaryColor3usvEXT\0"
-    "glSecondaryColorPointerEXT\0"
-    "glMultiDrawArraysEXT\0"
-    "glMultiDrawElementsEXT\0"
-    "glFogCoordPointerEXT\0"
-    "glFogCoorddEXT\0"
-    "glFogCoorddvEXT\0"
-    "glFogCoordfEXT\0"
-    "glFogCoordfvEXT\0"
-    "glPixelTexGenSGIX\0"
-    "glBlendFuncSeparateEXT\0"
-    "glFlushVertexArrayRangeNV\0"
-    "glVertexArrayRangeNV\0"
-    "glCombinerInputNV\0"
-    "glCombinerOutputNV\0"
-    "glCombinerParameterfNV\0"
-    "glCombinerParameterfvNV\0"
-    "glCombinerParameteriNV\0"
-    "glCombinerParameterivNV\0"
-    "glFinalCombinerInputNV\0"
-    "glGetCombinerInputParameterfvNV\0"
-    "glGetCombinerInputParameterivNV\0"
-    "glGetCombinerOutputParameterfvNV\0"
-    "glGetCombinerOutputParameterivNV\0"
-    "glGetFinalCombinerInputParameterfvNV\0"
-    "glGetFinalCombinerInputParameterivNV\0"
-    "glResizeBuffersMESA\0"
-    "glWindowPos2dMESA\0"
-    "glWindowPos2dvMESA\0"
-    "glWindowPos2fMESA\0"
-    "glWindowPos2fvMESA\0"
-    "glWindowPos2iMESA\0"
-    "glWindowPos2ivMESA\0"
-    "glWindowPos2sMESA\0"
-    "glWindowPos2svMESA\0"
-    "glWindowPos3dMESA\0"
-    "glWindowPos3dvMESA\0"
-    "glWindowPos3fMESA\0"
-    "glWindowPos3fvMESA\0"
-    "glWindowPos3iMESA\0"
-    "glWindowPos3ivMESA\0"
-    "glWindowPos3sMESA\0"
-    "glWindowPos3svMESA\0"
-    "glWindowPos4dMESA\0"
-    "glWindowPos4dvMESA\0"
-    "glWindowPos4fMESA\0"
-    "glWindowPos4fvMESA\0"
-    "glWindowPos4iMESA\0"
-    "glWindowPos4ivMESA\0"
-    "glWindowPos4sMESA\0"
-    "glWindowPos4svMESA\0"
-    "glMultiModeDrawArraysIBM\0"
-    "glMultiModeDrawElementsIBM\0"
-    "glDeleteFencesNV\0"
-    "glFinishFenceNV\0"
-    "glGenFencesNV\0"
-    "glGetFenceivNV\0"
-    "glIsFenceNV\0"
-    "glSetFenceNV\0"
-    "glTestFenceNV\0"
-    "glAreProgramsResidentNV\0"
-    "glBindProgramNV\0"
-    "glDeleteProgramsNV\0"
-    "glExecuteProgramNV\0"
-    "glGenProgramsNV\0"
-    "glGetProgramParameterdvNV\0"
-    "glGetProgramParameterfvNV\0"
-    "glGetProgramStringNV\0"
-    "glGetProgramivNV\0"
-    "glGetTrackMatrixivNV\0"
-    "glGetVertexAttribPointervNV\0"
-    "glGetVertexAttribdvNV\0"
-    "glGetVertexAttribfvNV\0"
-    "glGetVertexAttribivNV\0"
-    "glIsProgramNV\0"
-    "glLoadProgramNV\0"
-    "glProgramParameters4dvNV\0"
-    "glProgramParameters4fvNV\0"
-    "glRequestResidentProgramsNV\0"
-    "glTrackMatrixNV\0"
-    "glVertexAttrib1dNV\0"
-    "glVertexAttrib1dvNV\0"
-    "glVertexAttrib1fNV\0"
-    "glVertexAttrib1fvNV\0"
-    "glVertexAttrib1sNV\0"
-    "glVertexAttrib1svNV\0"
-    "glVertexAttrib2dNV\0"
-    "glVertexAttrib2dvNV\0"
-    "glVertexAttrib2fNV\0"
-    "glVertexAttrib2fvNV\0"
-    "glVertexAttrib2sNV\0"
-    "glVertexAttrib2svNV\0"
-    "glVertexAttrib3dNV\0"
-    "glVertexAttrib3dvNV\0"
-    "glVertexAttrib3fNV\0"
-    "glVertexAttrib3fvNV\0"
-    "glVertexAttrib3sNV\0"
-    "glVertexAttrib3svNV\0"
-    "glVertexAttrib4dNV\0"
-    "glVertexAttrib4dvNV\0"
-    "glVertexAttrib4fNV\0"
-    "glVertexAttrib4fvNV\0"
-    "glVertexAttrib4sNV\0"
-    "glVertexAttrib4svNV\0"
-    "glVertexAttrib4ubNV\0"
-    "glVertexAttrib4ubvNV\0"
-    "glVertexAttribPointerNV\0"
-    "glVertexAttribs1dvNV\0"
-    "glVertexAttribs1fvNV\0"
-    "glVertexAttribs1svNV\0"
-    "glVertexAttribs2dvNV\0"
-    "glVertexAttribs2fvNV\0"
-    "glVertexAttribs2svNV\0"
-    "glVertexAttribs3dvNV\0"
-    "glVertexAttribs3fvNV\0"
-    "glVertexAttribs3svNV\0"
-    "glVertexAttribs4dvNV\0"
-    "glVertexAttribs4fvNV\0"
-    "glVertexAttribs4svNV\0"
-    "glVertexAttribs4ubvNV\0"
-    "glGetTexBumpParameterfvATI\0"
-    "glGetTexBumpParameterivATI\0"
-    "glTexBumpParameterfvATI\0"
-    "glTexBumpParameterivATI\0"
-    "glAlphaFragmentOp1ATI\0"
-    "glAlphaFragmentOp2ATI\0"
-    "glAlphaFragmentOp3ATI\0"
-    "glBeginFragmentShaderATI\0"
-    "glBindFragmentShaderATI\0"
-    "glColorFragmentOp1ATI\0"
-    "glColorFragmentOp2ATI\0"
-    "glColorFragmentOp3ATI\0"
-    "glDeleteFragmentShaderATI\0"
-    "glEndFragmentShaderATI\0"
-    "glGenFragmentShadersATI\0"
-    "glPassTexCoordATI\0"
-    "glSampleMapATI\0"
-    "glSetFragmentShaderConstantATI\0"
-    "glPointParameteriNV\0"
-    "glPointParameterivNV\0"
-    "glActiveStencilFaceEXT\0"
-    "glBindVertexArrayAPPLE\0"
-    "glDeleteVertexArraysAPPLE\0"
-    "glGenVertexArraysAPPLE\0"
-    "glIsVertexArrayAPPLE\0"
-    "glGetProgramNamedParameterdvNV\0"
-    "glGetProgramNamedParameterfvNV\0"
-    "glProgramNamedParameter4dNV\0"
-    "glProgramNamedParameter4dvNV\0"
-    "glProgramNamedParameter4fNV\0"
-    "glProgramNamedParameter4fvNV\0"
-    "glPrimitiveRestartIndexNV\0"
-    "glPrimitiveRestartNV\0"
-    "glDepthBoundsEXT\0"
-    "glBlendEquationSeparateEXT\0"
-    "glBindFramebufferEXT\0"
-    "glBindRenderbufferEXT\0"
-    "glCheckFramebufferStatusEXT\0"
-    "glDeleteFramebuffersEXT\0"
-    "glDeleteRenderbuffersEXT\0"
-    "glFramebufferRenderbufferEXT\0"
-    "glFramebufferTexture1DEXT\0"
-    "glFramebufferTexture2DEXT\0"
-    "glFramebufferTexture3DEXT\0"
-    "glGenFramebuffersEXT\0"
-    "glGenRenderbuffersEXT\0"
-    "glGenerateMipmapEXT\0"
-    "glGetFramebufferAttachmentParameterivEXT\0"
-    "glGetRenderbufferParameterivEXT\0"
-    "glIsFramebufferEXT\0"
-    "glIsRenderbufferEXT\0"
-    "glRenderbufferStorageEXT\0"
-    "glBlitFramebufferEXT\0"
-    "glBufferParameteriAPPLE\0"
-    "glFlushMappedBufferRangeAPPLE\0"
-    "glBindFragDataLocationEXT\0"
-    "glGetFragDataLocationEXT\0"
-    "glGetUniformuivEXT\0"
-    "glGetVertexAttribIivEXT\0"
-    "glGetVertexAttribIuivEXT\0"
-    "glUniform1uiEXT\0"
-    "glUniform1uivEXT\0"
-    "glUniform2uiEXT\0"
-    "glUniform2uivEXT\0"
-    "glUniform3uiEXT\0"
-    "glUniform3uivEXT\0"
-    "glUniform4uiEXT\0"
-    "glUniform4uivEXT\0"
-    "glVertexAttribI1iEXT\0"
-    "glVertexAttribI1ivEXT\0"
-    "glVertexAttribI1uiEXT\0"
-    "glVertexAttribI1uivEXT\0"
-    "glVertexAttribI2iEXT\0"
-    "glVertexAttribI2ivEXT\0"
-    "glVertexAttribI2uiEXT\0"
-    "glVertexAttribI2uivEXT\0"
-    "glVertexAttribI3iEXT\0"
-    "glVertexAttribI3ivEXT\0"
-    "glVertexAttribI3uiEXT\0"
-    "glVertexAttribI3uivEXT\0"
-    "glVertexAttribI4bvEXT\0"
-    "glVertexAttribI4iEXT\0"
-    "glVertexAttribI4ivEXT\0"
-    "glVertexAttribI4svEXT\0"
-    "glVertexAttribI4ubvEXT\0"
-    "glVertexAttribI4uiEXT\0"
-    "glVertexAttribI4uivEXT\0"
-    "glVertexAttribI4usvEXT\0"
-    "glVertexAttribIPointerEXT\0"
-    "glFramebufferTextureLayerEXT\0"
-    "glColorMaskIndexedEXT\0"
-    "glDisableIndexedEXT\0"
-    "glEnableIndexedEXT\0"
-    "glGetBooleanIndexedvEXT\0"
-    "glGetIntegerIndexedvEXT\0"
-    "glIsEnabledIndexedEXT\0"
-    "glClearColorIiEXT\0"
-    "glClearColorIuiEXT\0"
-    "glGetTexParameterIivEXT\0"
-    "glGetTexParameterIuivEXT\0"
-    "glTexParameterIivEXT\0"
-    "glTexParameterIuivEXT\0"
-    "glBeginConditionalRenderNV\0"
-    "glEndConditionalRenderNV\0"
-    "glBeginTransformFeedbackEXT\0"
-    "glBindBufferBaseEXT\0"
-    "glBindBufferOffsetEXT\0"
-    "glBindBufferRangeEXT\0"
-    "glEndTransformFeedbackEXT\0"
-    "glGetTransformFeedbackVaryingEXT\0"
-    "glTransformFeedbackVaryingsEXT\0"
-    "glProvokingVertexEXT\0"
-    "glGetTexParameterPointervAPPLE\0"
-    "glTextureRangeAPPLE\0"
-    "glGetObjectParameterivAPPLE\0"
-    "glObjectPurgeableAPPLE\0"
-    "glObjectUnpurgeableAPPLE\0"
-    "glActiveProgramEXT\0"
-    "glCreateShaderProgramEXT\0"
-    "glUseShaderProgramEXT\0"
-    "glTextureBarrierNV\0"
-    "glStencilFuncSeparateATI\0"
-    "glProgramEnvParameters4fvEXT\0"
-    "glProgramLocalParameters4fvEXT\0"
-    "glGetQueryObjecti64vEXT\0"
-    "glGetQueryObjectui64vEXT\0"
-    "glEGLImageTargetRenderbufferStorageOES\0"
-    "glEGLImageTargetTexture2DOES\0"
-    "glArrayElementEXT\0"
-    "glBindTextureEXT\0"
-    "glDrawArraysEXT\0"
-    "glAreTexturesResidentEXT\0"
-    "glCopyTexImage1DEXT\0"
-    "glCopyTexImage2DEXT\0"
-    "glCopyTexSubImage1DEXT\0"
-    "glCopyTexSubImage2DEXT\0"
-    "glDeleteTexturesEXT\0"
-    "glGenTexturesEXT\0"
-    "glGetPointervEXT\0"
-    "glIsTextureEXT\0"
-    "glPrioritizeTexturesEXT\0"
-    "glTexSubImage1DEXT\0"
-    "glTexSubImage2DEXT\0"
-    "glBlendColorEXT\0"
-    "glBlendEquationEXT\0"
-    "glDrawRangeElementsEXT\0"
-    "glColorTableSGI\0"
-    "glColorTableEXT\0"
-    "glColorTableParameterfvSGI\0"
-    "glColorTableParameterivSGI\0"
-    "glCopyColorTableSGI\0"
-    "glGetColorTableSGI\0"
-    "glGetColorTableEXT\0"
-    "glGetColorTableParameterfvSGI\0"
-    "glGetColorTableParameterfvEXT\0"
-    "glGetColorTableParameterivSGI\0"
-    "glGetColorTableParameterivEXT\0"
-    "glColorSubTableEXT\0"
-    "glCopyColorSubTableEXT\0"
-    "glConvolutionFilter1DEXT\0"
-    "glConvolutionFilter2DEXT\0"
-    "glConvolutionParameterfEXT\0"
-    "glConvolutionParameterfvEXT\0"
-    "glConvolutionParameteriEXT\0"
-    "glConvolutionParameterivEXT\0"
-    "glCopyConvolutionFilter1DEXT\0"
-    "glCopyConvolutionFilter2DEXT\0"
-    "glGetConvolutionFilterEXT\0"
-    "glGetConvolutionParameterfvEXT\0"
-    "glGetConvolutionParameterivEXT\0"
-    "glGetSeparableFilterEXT\0"
-    "glSeparableFilter2DEXT\0"
-    "glGetHistogramEXT\0"
-    "glGetHistogramParameterfvEXT\0"
-    "glGetHistogramParameterivEXT\0"
-    "glGetMinmaxEXT\0"
-    "glGetMinmaxParameterfvEXT\0"
-    "glGetMinmaxParameterivEXT\0"
-    "glHistogramEXT\0"
-    "glMinmaxEXT\0"
-    "glResetHistogramEXT\0"
-    "glResetMinmaxEXT\0"
-    "glTexImage3DEXT\0"
-    "glTexSubImage3DEXT\0"
-    "glCopyTexSubImage3DEXT\0"
-    "glActiveTexture\0"
-    "glClientActiveTexture\0"
-    "glMultiTexCoord1d\0"
-    "glMultiTexCoord1dv\0"
-    "glMultiTexCoord1f\0"
-    "glMultiTexCoord1fv\0"
-    "glMultiTexCoord1i\0"
-    "glMultiTexCoord1iv\0"
-    "glMultiTexCoord1s\0"
-    "glMultiTexCoord1sv\0"
-    "glMultiTexCoord2d\0"
-    "glMultiTexCoord2dv\0"
-    "glMultiTexCoord2f\0"
-    "glMultiTexCoord2fv\0"
-    "glMultiTexCoord2i\0"
-    "glMultiTexCoord2iv\0"
-    "glMultiTexCoord2s\0"
-    "glMultiTexCoord2sv\0"
-    "glMultiTexCoord3d\0"
-    "glMultiTexCoord3dv\0"
-    "glMultiTexCoord3f\0"
-    "glMultiTexCoord3fv\0"
-    "glMultiTexCoord3i\0"
-    "glMultiTexCoord3iv\0"
-    "glMultiTexCoord3s\0"
-    "glMultiTexCoord3sv\0"
-    "glMultiTexCoord4d\0"
-    "glMultiTexCoord4dv\0"
-    "glMultiTexCoord4f\0"
-    "glMultiTexCoord4fv\0"
-    "glMultiTexCoord4i\0"
-    "glMultiTexCoord4iv\0"
-    "glMultiTexCoord4s\0"
-    "glMultiTexCoord4sv\0"
-    "glStencilOpSeparateATI\0"
-    "glLoadTransposeMatrixd\0"
-    "glLoadTransposeMatrixf\0"
-    "glMultTransposeMatrixd\0"
-    "glMultTransposeMatrixf\0"
-    "glSampleCoverage\0"
-    "glCompressedTexImage1D\0"
-    "glCompressedTexImage2D\0"
-    "glCompressedTexImage3D\0"
-    "glCompressedTexSubImage1D\0"
-    "glCompressedTexSubImage2D\0"
-    "glCompressedTexSubImage3D\0"
-    "glGetCompressedTexImage\0"
-    "glDisableVertexAttribArray\0"
-    "glEnableVertexAttribArray\0"
-    "glGetVertexAttribdv\0"
-    "glGetVertexAttribfv\0"
-    "glGetVertexAttribiv\0"
-    "glProgramParameter4dNV\0"
-    "glProgramParameter4dvNV\0"
-    "glProgramParameter4fNV\0"
-    "glProgramParameter4fvNV\0"
-    "glVertexAttrib1d\0"
-    "glVertexAttrib1dv\0"
-    "glVertexAttrib1f\0"
-    "glVertexAttrib1fv\0"
-    "glVertexAttrib1s\0"
-    "glVertexAttrib1sv\0"
-    "glVertexAttrib2d\0"
-    "glVertexAttrib2dv\0"
-    "glVertexAttrib2f\0"
-    "glVertexAttrib2fv\0"
-    "glVertexAttrib2s\0"
-    "glVertexAttrib2sv\0"
-    "glVertexAttrib3d\0"
-    "glVertexAttrib3dv\0"
-    "glVertexAttrib3f\0"
-    "glVertexAttrib3fv\0"
-    "glVertexAttrib3s\0"
-    "glVertexAttrib3sv\0"
-    "glVertexAttrib4Nbv\0"
-    "glVertexAttrib4Niv\0"
-    "glVertexAttrib4Nsv\0"
-    "glVertexAttrib4Nub\0"
-    "glVertexAttrib4Nubv\0"
-    "glVertexAttrib4Nuiv\0"
-    "glVertexAttrib4Nusv\0"
-    "glVertexAttrib4bv\0"
-    "glVertexAttrib4d\0"
-    "glVertexAttrib4dv\0"
-    "glVertexAttrib4f\0"
-    "glVertexAttrib4fv\0"
-    "glVertexAttrib4iv\0"
-    "glVertexAttrib4s\0"
-    "glVertexAttrib4sv\0"
-    "glVertexAttrib4ubv\0"
-    "glVertexAttrib4uiv\0"
-    "glVertexAttrib4usv\0"
-    "glVertexAttribPointer\0"
-    "glBindBuffer\0"
-    "glBufferData\0"
-    "glBufferSubData\0"
-    "glDeleteBuffers\0"
-    "glGenBuffers\0"
-    "glGetBufferParameteriv\0"
-    "glGetBufferPointerv\0"
-    "glGetBufferSubData\0"
-    "glIsBuffer\0"
-    "glMapBuffer\0"
-    "glUnmapBuffer\0"
-    "glBeginQuery\0"
-    "glDeleteQueries\0"
-    "glEndQuery\0"
-    "glGenQueries\0"
-    "glGetQueryObjectiv\0"
-    "glGetQueryObjectuiv\0"
-    "glGetQueryiv\0"
-    "glIsQuery\0"
-    "glCompileShader\0"
-    "glGetActiveUniform\0"
-    "glGetShaderSource\0"
-    "glGetUniformLocation\0"
-    "glGetUniformfv\0"
-    "glGetUniformiv\0"
-    "glLinkProgram\0"
-    "glShaderSource\0"
-    "glUniform1f\0"
-    "glUniform1fv\0"
-    "glUniform1i\0"
-    "glUniform1iv\0"
-    "glUniform2f\0"
-    "glUniform2fv\0"
-    "glUniform2i\0"
-    "glUniform2iv\0"
-    "glUniform3f\0"
-    "glUniform3fv\0"
-    "glUniform3i\0"
-    "glUniform3iv\0"
-    "glUniform4f\0"
-    "glUniform4fv\0"
-    "glUniform4i\0"
-    "glUniform4iv\0"
-    "glUniformMatrix2fv\0"
-    "glUniformMatrix3fv\0"
-    "glUniformMatrix4fv\0"
-    "glUseProgram\0"
-    "glValidateProgram\0"
-    "glBindAttribLocation\0"
-    "glGetActiveAttrib\0"
-    "glGetAttribLocation\0"
-    "glDrawBuffers\0"
-    "glDrawBuffersATI\0"
-    "glDrawBuffersNV\0"
-    "glDrawArraysInstancedEXT\0"
-    "glDrawArraysInstanced\0"
-    "glDrawElementsInstancedEXT\0"
-    "glDrawElementsInstanced\0"
-    "glRenderbufferStorageMultisampleEXT\0"
-    "glBlendEquationSeparateIndexedAMD\0"
-    "glBlendEquationIndexedAMD\0"
-    "glBlendFuncSeparateIndexedAMD\0"
-    "glBlendFuncIndexedAMD\0"
-    "glSampleMaskEXT\0"
-    "glSamplePatternEXT\0"
-    "glPointParameterf\0"
-    "glPointParameterfARB\0"
-    "glPointParameterfSGIS\0"
-    "glPointParameterfv\0"
-    "glPointParameterfvARB\0"
-    "glPointParameterfvSGIS\0"
-    "glSecondaryColor3b\0"
-    "glSecondaryColor3bv\0"
-    "glSecondaryColor3d\0"
-    "glSecondaryColor3dv\0"
-    "glSecondaryColor3f\0"
-    "glSecondaryColor3fv\0"
-    "glSecondaryColor3i\0"
-    "glSecondaryColor3iv\0"
-    "glSecondaryColor3s\0"
-    "glSecondaryColor3sv\0"
-    "glSecondaryColor3ub\0"
-    "glSecondaryColor3ubv\0"
-    "glSecondaryColor3ui\0"
-    "glSecondaryColor3uiv\0"
-    "glSecondaryColor3us\0"
-    "glSecondaryColor3usv\0"
-    "glSecondaryColorPointer\0"
-    "glMultiDrawArrays\0"
-    "glMultiDrawElements\0"
-    "glFogCoordPointer\0"
-    "glFogCoordd\0"
-    "glFogCoorddv\0"
-    "glFogCoordf\0"
-    "glFogCoordfv\0"
-    "glBlendFuncSeparate\0"
-    "glBlendFuncSeparateINGR\0"
-    "glWindowPos2d\0"
-    "glWindowPos2dARB\0"
-    "glWindowPos2dv\0"
-    "glWindowPos2dvARB\0"
-    "glWindowPos2f\0"
-    "glWindowPos2fARB\0"
-    "glWindowPos2fv\0"
-    "glWindowPos2fvARB\0"
-    "glWindowPos2i\0"
-    "glWindowPos2iARB\0"
-    "glWindowPos2iv\0"
-    "glWindowPos2ivARB\0"
-    "glWindowPos2s\0"
-    "glWindowPos2sARB\0"
-    "glWindowPos2sv\0"
-    "glWindowPos2svARB\0"
-    "glWindowPos3d\0"
-    "glWindowPos3dARB\0"
-    "glWindowPos3dv\0"
-    "glWindowPos3dvARB\0"
-    "glWindowPos3f\0"
-    "glWindowPos3fARB\0"
-    "glWindowPos3fv\0"
-    "glWindowPos3fvARB\0"
-    "glWindowPos3i\0"
-    "glWindowPos3iARB\0"
-    "glWindowPos3iv\0"
-    "glWindowPos3ivARB\0"
-    "glWindowPos3s\0"
-    "glWindowPos3sARB\0"
-    "glWindowPos3sv\0"
-    "glWindowPos3svARB\0"
-    "glBindProgramARB\0"
-    "glDeleteProgramsARB\0"
-    "glGenProgramsARB\0"
-    "glGetVertexAttribPointerv\0"
-    "glGetVertexAttribPointervARB\0"
-    "glIsProgramARB\0"
-    "glPointParameteri\0"
-    "glPointParameteriv\0"
-    "glDeleteVertexArrays\0"
-    "glIsVertexArray\0"
-    "glPrimitiveRestartIndex\0"
-    "glBlendEquationSeparate\0"
-    "glBlendEquationSeparateATI\0"
-    "glBindFramebuffer\0"
-    "glBindRenderbuffer\0"
-    "glCheckFramebufferStatus\0"
-    "glDeleteFramebuffers\0"
-    "glDeleteRenderbuffers\0"
-    "glFramebufferRenderbuffer\0"
-    "glFramebufferTexture1D\0"
-    "glFramebufferTexture2D\0"
-    "glFramebufferTexture3D\0"
-    "glGenFramebuffers\0"
-    "glGenRenderbuffers\0"
-    "glGenerateMipmap\0"
-    "glGetFramebufferAttachmentParameteriv\0"
-    "glGetRenderbufferParameteriv\0"
-    "glIsFramebuffer\0"
-    "glIsRenderbuffer\0"
-    "glRenderbufferStorage\0"
-    "glBlitFramebuffer\0"
-    "glBindFragDataLocation\0"
-    "glGetFragDataLocation\0"
-    "glGetUniformuiv\0"
-    "glGetVertexAttribIiv\0"
-    "glGetVertexAttribIuiv\0"
-    "glUniform1ui\0"
-    "glUniform1uiv\0"
-    "glUniform2ui\0"
-    "glUniform2uiv\0"
-    "glUniform3ui\0"
-    "glUniform3uiv\0"
-    "glUniform4ui\0"
-    "glUniform4uiv\0"
-    "glVertexAttribI1i\0"
-    "glVertexAttribI1iv\0"
-    "glVertexAttribI1ui\0"
-    "glVertexAttribI1uiv\0"
-    "glVertexAttribI2i\0"
-    "glVertexAttribI2iv\0"
-    "glVertexAttribI2ui\0"
-    "glVertexAttribI2uiv\0"
-    "glVertexAttribI3i\0"
-    "glVertexAttribI3iv\0"
-    "glVertexAttribI3ui\0"
-    "glVertexAttribI3uiv\0"
-    "glVertexAttribI4bv\0"
-    "glVertexAttribI4i\0"
-    "glVertexAttribI4iv\0"
-    "glVertexAttribI4sv\0"
-    "glVertexAttribI4ubv\0"
-    "glVertexAttribI4ui\0"
-    "glVertexAttribI4uiv\0"
-    "glVertexAttribI4usv\0"
-    "glVertexAttribIPointer\0"
-    "glFramebufferTextureLayer\0"
-    "glFramebufferTextureLayerARB\0"
-    "glColorMaski\0"
-    "glDisablei\0"
-    "glEnablei\0"
-    "glGetBooleani_v\0"
-    "glGetIntegeri_v\0"
-    "glIsEnabledi\0"
-    "glGetTexParameterIiv\0"
-    "glGetTexParameterIuiv\0"
-    "glTexParameterIiv\0"
-    "glTexParameterIuiv\0"
-    "glBeginConditionalRender\0"
-    "glEndConditionalRender\0"
-    "glBeginTransformFeedback\0"
-    "glBindBufferBase\0"
-    "glBindBufferRange\0"
-    "glEndTransformFeedback\0"
-    "glGetTransformFeedbackVarying\0"
-    "glTransformFeedbackVaryings\0" "glProvokingVertex\0";
-
-#ifdef USE_MGL_NAMESPACE
-#define gl_dispatch_stub_343 mgl_dispatch_stub_343
-#define gl_dispatch_stub_344 mgl_dispatch_stub_344
-#define gl_dispatch_stub_345 mgl_dispatch_stub_345
-#define gl_dispatch_stub_356 mgl_dispatch_stub_356
-#define gl_dispatch_stub_357 mgl_dispatch_stub_357
-#define gl_dispatch_stub_358 mgl_dispatch_stub_358
-#define gl_dispatch_stub_359 mgl_dispatch_stub_359
-#define gl_dispatch_stub_361 mgl_dispatch_stub_361
-#define gl_dispatch_stub_362 mgl_dispatch_stub_362
-#define gl_dispatch_stub_363 mgl_dispatch_stub_363
-#define gl_dispatch_stub_364 mgl_dispatch_stub_364
-#define gl_dispatch_stub_365 mgl_dispatch_stub_365
-#define gl_dispatch_stub_366 mgl_dispatch_stub_366
-#define gl_dispatch_stub_692 mgl_dispatch_stub_692
-#define gl_dispatch_stub_693 mgl_dispatch_stub_693
-#define gl_dispatch_stub_694 mgl_dispatch_stub_694
-#define gl_dispatch_stub_695 mgl_dispatch_stub_695
-#define gl_dispatch_stub_696 mgl_dispatch_stub_696
-#define gl_dispatch_stub_697 mgl_dispatch_stub_697
-#define gl_dispatch_stub_698 mgl_dispatch_stub_698
-#define gl_dispatch_stub_699 mgl_dispatch_stub_699
-#define gl_dispatch_stub_734 mgl_dispatch_stub_734
-#define gl_dispatch_stub_776 mgl_dispatch_stub_776
-#define gl_dispatch_stub_777 mgl_dispatch_stub_777
-#define gl_dispatch_stub_778 mgl_dispatch_stub_778
-#define gl_dispatch_stub_779 mgl_dispatch_stub_779
-#define gl_dispatch_stub_780 mgl_dispatch_stub_780
-#define gl_dispatch_stub_781 mgl_dispatch_stub_781
-#define gl_dispatch_stub_782 mgl_dispatch_stub_782
-#define gl_dispatch_stub_783 mgl_dispatch_stub_783
-#define gl_dispatch_stub_784 mgl_dispatch_stub_784
-#define gl_dispatch_stub_865 mgl_dispatch_stub_865
-#define gl_dispatch_stub_866 mgl_dispatch_stub_866
-#define gl_dispatch_stub_867 mgl_dispatch_stub_867
-#define gl_dispatch_stub_868 mgl_dispatch_stub_868
-#define gl_dispatch_stub_869 mgl_dispatch_stub_869
-#define gl_dispatch_stub_878 mgl_dispatch_stub_878
-#define gl_dispatch_stub_879 mgl_dispatch_stub_879
-#define gl_dispatch_stub_897 mgl_dispatch_stub_897
-#define gl_dispatch_stub_898 mgl_dispatch_stub_898
-#define gl_dispatch_stub_899 mgl_dispatch_stub_899
-#define gl_dispatch_stub_957 mgl_dispatch_stub_957
-#define gl_dispatch_stub_958 mgl_dispatch_stub_958
-#define gl_dispatch_stub_966 mgl_dispatch_stub_966
-#define gl_dispatch_stub_967 mgl_dispatch_stub_967
-#define gl_dispatch_stub_968 mgl_dispatch_stub_968
-#define gl_dispatch_stub_969 mgl_dispatch_stub_969
-#define gl_dispatch_stub_970 mgl_dispatch_stub_970
-#endif                          /* USE_MGL_NAMESPACE */
-
-#if defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING)
-void GLAPIENTRY gl_dispatch_stub_343(GLenum target, GLenum format, GLenum type,
-                                     GLvoid * table);
-void GLAPIENTRY gl_dispatch_stub_344(GLenum target, GLenum pname,
-                                     GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_345(GLenum target, GLenum pname,
-                                     GLint * params);
-void GLAPIENTRY gl_dispatch_stub_356(GLenum target, GLenum format, GLenum type,
-                                     GLvoid * image);
-void GLAPIENTRY gl_dispatch_stub_357(GLenum target, GLenum pname,
-                                     GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_358(GLenum target, GLenum pname,
-                                     GLint * params);
-void GLAPIENTRY gl_dispatch_stub_359(GLenum target, GLenum format, GLenum type,
-                                     GLvoid * row, GLvoid * column,
-                                     GLvoid * span);
-void GLAPIENTRY gl_dispatch_stub_361(GLenum target, GLboolean reset,
-                                     GLenum format, GLenum type,
-                                     GLvoid * values);
-void GLAPIENTRY gl_dispatch_stub_362(GLenum target, GLenum pname,
-                                     GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname,
-                                     GLint * params);
-void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset,
-                                     GLenum format, GLenum type,
-                                     GLvoid * values);
-void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname,
-                                     GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname,
-                                     GLint * params);
-void GLAPIENTRY gl_dispatch_stub_692(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_693(GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_694(GLenum pname, GLfloat param);
-void GLAPIENTRY gl_dispatch_stub_695(GLenum pname, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_696(GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_697(GLenum pname, const GLint * params);
-void GLAPIENTRY gl_dispatch_stub_698(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_699(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_734(GLenum mode);
-void GLAPIENTRY gl_dispatch_stub_776(const GLenum * mode, const GLint * first,
-                                     const GLsizei * count, GLsizei primcount,
-                                     GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_777(const GLenum * mode, const GLsizei * count,
-                                     GLenum type, const GLvoid * const *indices,
-                                     GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_778(GLsizei n, const GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_779(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_780(GLsizei n, GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_781(GLuint fence, GLenum pname,
-                                     GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_782(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_783(GLuint fence, GLenum condition);
-GLboolean GLAPIENTRY gl_dispatch_stub_784(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_865(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_866(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_867(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_868(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_869(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_878(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_879(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_897(GLint srcX0, GLint srcY0, GLint srcX1,
-                                     GLint srcY1, GLint dstX0, GLint dstY0,
-                                     GLint dstX1, GLint dstY1, GLbitfield mask,
-                                     GLenum filter);
-void GLAPIENTRY gl_dispatch_stub_898(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_899(GLenum target, GLintptr offset,
-                                     GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_957(GLenum target, GLenum pname,
-                                     GLvoid ** params);
-void GLAPIENTRY gl_dispatch_stub_958(GLenum target, GLsizei length,
-                                     GLvoid * pointer);
-void GLAPIENTRY gl_dispatch_stub_966(GLenum frontfunc, GLenum backfunc,
-                                     GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_967(GLenum target, GLuint index, GLsizei count,
-                                     const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_968(GLenum target, GLuint index, GLsizei count,
-                                     const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_969(GLuint id, GLenum pname,
-                                     GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_970(GLuint id, GLenum pname,
-                                     GLuint64EXT * params);
-#endif                          /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
-
-static const glprocs_table_t static_functions[] = {
-    NAME_FUNC_OFFSET(0, glNewList, glNewList, NULL, 0),
-    NAME_FUNC_OFFSET(10, glEndList, glEndList, NULL, 1),
-    NAME_FUNC_OFFSET(20, glCallList, glCallList, NULL, 2),
-    NAME_FUNC_OFFSET(31, glCallLists, glCallLists, NULL, 3),
-    NAME_FUNC_OFFSET(43, glDeleteLists, glDeleteLists, NULL, 4),
-    NAME_FUNC_OFFSET(57, glGenLists, glGenLists, NULL, 5),
-    NAME_FUNC_OFFSET(68, glListBase, glListBase, NULL, 6),
-    NAME_FUNC_OFFSET(79, glBegin, glBegin, NULL, 7),
-    NAME_FUNC_OFFSET(87, glBitmap, glBitmap, NULL, 8),
-    NAME_FUNC_OFFSET(96, glColor3b, glColor3b, NULL, 9),
-    NAME_FUNC_OFFSET(106, glColor3bv, glColor3bv, NULL, 10),
-    NAME_FUNC_OFFSET(117, glColor3d, glColor3d, NULL, 11),
-    NAME_FUNC_OFFSET(127, glColor3dv, glColor3dv, NULL, 12),
-    NAME_FUNC_OFFSET(138, glColor3f, glColor3f, NULL, 13),
-    NAME_FUNC_OFFSET(148, glColor3fv, glColor3fv, NULL, 14),
-    NAME_FUNC_OFFSET(159, glColor3i, glColor3i, NULL, 15),
-    NAME_FUNC_OFFSET(169, glColor3iv, glColor3iv, NULL, 16),
-    NAME_FUNC_OFFSET(180, glColor3s, glColor3s, NULL, 17),
-    NAME_FUNC_OFFSET(190, glColor3sv, glColor3sv, NULL, 18),
-    NAME_FUNC_OFFSET(201, glColor3ub, glColor3ub, NULL, 19),
-    NAME_FUNC_OFFSET(212, glColor3ubv, glColor3ubv, NULL, 20),
-    NAME_FUNC_OFFSET(224, glColor3ui, glColor3ui, NULL, 21),
-    NAME_FUNC_OFFSET(235, glColor3uiv, glColor3uiv, NULL, 22),
-    NAME_FUNC_OFFSET(247, glColor3us, glColor3us, NULL, 23),
-    NAME_FUNC_OFFSET(258, glColor3usv, glColor3usv, NULL, 24),
-    NAME_FUNC_OFFSET(270, glColor4b, glColor4b, NULL, 25),
-    NAME_FUNC_OFFSET(280, glColor4bv, glColor4bv, NULL, 26),
-    NAME_FUNC_OFFSET(291, glColor4d, glColor4d, NULL, 27),
-    NAME_FUNC_OFFSET(301, glColor4dv, glColor4dv, NULL, 28),
-    NAME_FUNC_OFFSET(312, glColor4f, glColor4f, NULL, 29),
-    NAME_FUNC_OFFSET(322, glColor4fv, glColor4fv, NULL, 30),
-    NAME_FUNC_OFFSET(333, glColor4i, glColor4i, NULL, 31),
-    NAME_FUNC_OFFSET(343, glColor4iv, glColor4iv, NULL, 32),
-    NAME_FUNC_OFFSET(354, glColor4s, glColor4s, NULL, 33),
-    NAME_FUNC_OFFSET(364, glColor4sv, glColor4sv, NULL, 34),
-    NAME_FUNC_OFFSET(375, glColor4ub, glColor4ub, NULL, 35),
-    NAME_FUNC_OFFSET(386, glColor4ubv, glColor4ubv, NULL, 36),
-    NAME_FUNC_OFFSET(398, glColor4ui, glColor4ui, NULL, 37),
-    NAME_FUNC_OFFSET(409, glColor4uiv, glColor4uiv, NULL, 38),
-    NAME_FUNC_OFFSET(421, glColor4us, glColor4us, NULL, 39),
-    NAME_FUNC_OFFSET(432, glColor4usv, glColor4usv, NULL, 40),
-    NAME_FUNC_OFFSET(444, glEdgeFlag, glEdgeFlag, NULL, 41),
-    NAME_FUNC_OFFSET(455, glEdgeFlagv, glEdgeFlagv, NULL, 42),
-    NAME_FUNC_OFFSET(467, glEnd, glEnd, NULL, 43),
-    NAME_FUNC_OFFSET(473, glIndexd, glIndexd, NULL, 44),
-    NAME_FUNC_OFFSET(482, glIndexdv, glIndexdv, NULL, 45),
-    NAME_FUNC_OFFSET(492, glIndexf, glIndexf, NULL, 46),
-    NAME_FUNC_OFFSET(501, glIndexfv, glIndexfv, NULL, 47),
-    NAME_FUNC_OFFSET(511, glIndexi, glIndexi, NULL, 48),
-    NAME_FUNC_OFFSET(520, glIndexiv, glIndexiv, NULL, 49),
-    NAME_FUNC_OFFSET(530, glIndexs, glIndexs, NULL, 50),
-    NAME_FUNC_OFFSET(539, glIndexsv, glIndexsv, NULL, 51),
-    NAME_FUNC_OFFSET(549, glNormal3b, glNormal3b, NULL, 52),
-    NAME_FUNC_OFFSET(560, glNormal3bv, glNormal3bv, NULL, 53),
-    NAME_FUNC_OFFSET(572, glNormal3d, glNormal3d, NULL, 54),
-    NAME_FUNC_OFFSET(583, glNormal3dv, glNormal3dv, NULL, 55),
-    NAME_FUNC_OFFSET(595, glNormal3f, glNormal3f, NULL, 56),
-    NAME_FUNC_OFFSET(606, glNormal3fv, glNormal3fv, NULL, 57),
-    NAME_FUNC_OFFSET(618, glNormal3i, glNormal3i, NULL, 58),
-    NAME_FUNC_OFFSET(629, glNormal3iv, glNormal3iv, NULL, 59),
-    NAME_FUNC_OFFSET(641, glNormal3s, glNormal3s, NULL, 60),
-    NAME_FUNC_OFFSET(652, glNormal3sv, glNormal3sv, NULL, 61),
-    NAME_FUNC_OFFSET(664, glRasterPos2d, glRasterPos2d, NULL, 62),
-    NAME_FUNC_OFFSET(678, glRasterPos2dv, glRasterPos2dv, NULL, 63),
-    NAME_FUNC_OFFSET(693, glRasterPos2f, glRasterPos2f, NULL, 64),
-    NAME_FUNC_OFFSET(707, glRasterPos2fv, glRasterPos2fv, NULL, 65),
-    NAME_FUNC_OFFSET(722, glRasterPos2i, glRasterPos2i, NULL, 66),
-    NAME_FUNC_OFFSET(736, glRasterPos2iv, glRasterPos2iv, NULL, 67),
-    NAME_FUNC_OFFSET(751, glRasterPos2s, glRasterPos2s, NULL, 68),
-    NAME_FUNC_OFFSET(765, glRasterPos2sv, glRasterPos2sv, NULL, 69),
-    NAME_FUNC_OFFSET(780, glRasterPos3d, glRasterPos3d, NULL, 70),
-    NAME_FUNC_OFFSET(794, glRasterPos3dv, glRasterPos3dv, NULL, 71),
-    NAME_FUNC_OFFSET(809, glRasterPos3f, glRasterPos3f, NULL, 72),
-    NAME_FUNC_OFFSET(823, glRasterPos3fv, glRasterPos3fv, NULL, 73),
-    NAME_FUNC_OFFSET(838, glRasterPos3i, glRasterPos3i, NULL, 74),
-    NAME_FUNC_OFFSET(852, glRasterPos3iv, glRasterPos3iv, NULL, 75),
-    NAME_FUNC_OFFSET(867, glRasterPos3s, glRasterPos3s, NULL, 76),
-    NAME_FUNC_OFFSET(881, glRasterPos3sv, glRasterPos3sv, NULL, 77),
-    NAME_FUNC_OFFSET(896, glRasterPos4d, glRasterPos4d, NULL, 78),
-    NAME_FUNC_OFFSET(910, glRasterPos4dv, glRasterPos4dv, NULL, 79),
-    NAME_FUNC_OFFSET(925, glRasterPos4f, glRasterPos4f, NULL, 80),
-    NAME_FUNC_OFFSET(939, glRasterPos4fv, glRasterPos4fv, NULL, 81),
-    NAME_FUNC_OFFSET(954, glRasterPos4i, glRasterPos4i, NULL, 82),
-    NAME_FUNC_OFFSET(968, glRasterPos4iv, glRasterPos4iv, NULL, 83),
-    NAME_FUNC_OFFSET(983, glRasterPos4s, glRasterPos4s, NULL, 84),
-    NAME_FUNC_OFFSET(997, glRasterPos4sv, glRasterPos4sv, NULL, 85),
-    NAME_FUNC_OFFSET(1012, glRectd, glRectd, NULL, 86),
-    NAME_FUNC_OFFSET(1020, glRectdv, glRectdv, NULL, 87),
-    NAME_FUNC_OFFSET(1029, glRectf, glRectf, NULL, 88),
-    NAME_FUNC_OFFSET(1037, glRectfv, glRectfv, NULL, 89),
-    NAME_FUNC_OFFSET(1046, glRecti, glRecti, NULL, 90),
-    NAME_FUNC_OFFSET(1054, glRectiv, glRectiv, NULL, 91),
-    NAME_FUNC_OFFSET(1063, glRects, glRects, NULL, 92),
-    NAME_FUNC_OFFSET(1071, glRectsv, glRectsv, NULL, 93),
-    NAME_FUNC_OFFSET(1080, glTexCoord1d, glTexCoord1d, NULL, 94),
-    NAME_FUNC_OFFSET(1093, glTexCoord1dv, glTexCoord1dv, NULL, 95),
-    NAME_FUNC_OFFSET(1107, glTexCoord1f, glTexCoord1f, NULL, 96),
-    NAME_FUNC_OFFSET(1120, glTexCoord1fv, glTexCoord1fv, NULL, 97),
-    NAME_FUNC_OFFSET(1134, glTexCoord1i, glTexCoord1i, NULL, 98),
-    NAME_FUNC_OFFSET(1147, glTexCoord1iv, glTexCoord1iv, NULL, 99),
-    NAME_FUNC_OFFSET(1161, glTexCoord1s, glTexCoord1s, NULL, 100),
-    NAME_FUNC_OFFSET(1174, glTexCoord1sv, glTexCoord1sv, NULL, 101),
-    NAME_FUNC_OFFSET(1188, glTexCoord2d, glTexCoord2d, NULL, 102),
-    NAME_FUNC_OFFSET(1201, glTexCoord2dv, glTexCoord2dv, NULL, 103),
-    NAME_FUNC_OFFSET(1215, glTexCoord2f, glTexCoord2f, NULL, 104),
-    NAME_FUNC_OFFSET(1228, glTexCoord2fv, glTexCoord2fv, NULL, 105),
-    NAME_FUNC_OFFSET(1242, glTexCoord2i, glTexCoord2i, NULL, 106),
-    NAME_FUNC_OFFSET(1255, glTexCoord2iv, glTexCoord2iv, NULL, 107),
-    NAME_FUNC_OFFSET(1269, glTexCoord2s, glTexCoord2s, NULL, 108),
-    NAME_FUNC_OFFSET(1282, glTexCoord2sv, glTexCoord2sv, NULL, 109),
-    NAME_FUNC_OFFSET(1296, glTexCoord3d, glTexCoord3d, NULL, 110),
-    NAME_FUNC_OFFSET(1309, glTexCoord3dv, glTexCoord3dv, NULL, 111),
-    NAME_FUNC_OFFSET(1323, glTexCoord3f, glTexCoord3f, NULL, 112),
-    NAME_FUNC_OFFSET(1336, glTexCoord3fv, glTexCoord3fv, NULL, 113),
-    NAME_FUNC_OFFSET(1350, glTexCoord3i, glTexCoord3i, NULL, 114),
-    NAME_FUNC_OFFSET(1363, glTexCoord3iv, glTexCoord3iv, NULL, 115),
-    NAME_FUNC_OFFSET(1377, glTexCoord3s, glTexCoord3s, NULL, 116),
-    NAME_FUNC_OFFSET(1390, glTexCoord3sv, glTexCoord3sv, NULL, 117),
-    NAME_FUNC_OFFSET(1404, glTexCoord4d, glTexCoord4d, NULL, 118),
-    NAME_FUNC_OFFSET(1417, glTexCoord4dv, glTexCoord4dv, NULL, 119),
-    NAME_FUNC_OFFSET(1431, glTexCoord4f, glTexCoord4f, NULL, 120),
-    NAME_FUNC_OFFSET(1444, glTexCoord4fv, glTexCoord4fv, NULL, 121),
-    NAME_FUNC_OFFSET(1458, glTexCoord4i, glTexCoord4i, NULL, 122),
-    NAME_FUNC_OFFSET(1471, glTexCoord4iv, glTexCoord4iv, NULL, 123),
-    NAME_FUNC_OFFSET(1485, glTexCoord4s, glTexCoord4s, NULL, 124),
-    NAME_FUNC_OFFSET(1498, glTexCoord4sv, glTexCoord4sv, NULL, 125),
-    NAME_FUNC_OFFSET(1512, glVertex2d, glVertex2d, NULL, 126),
-    NAME_FUNC_OFFSET(1523, glVertex2dv, glVertex2dv, NULL, 127),
-    NAME_FUNC_OFFSET(1535, glVertex2f, glVertex2f, NULL, 128),
-    NAME_FUNC_OFFSET(1546, glVertex2fv, glVertex2fv, NULL, 129),
-    NAME_FUNC_OFFSET(1558, glVertex2i, glVertex2i, NULL, 130),
-    NAME_FUNC_OFFSET(1569, glVertex2iv, glVertex2iv, NULL, 131),
-    NAME_FUNC_OFFSET(1581, glVertex2s, glVertex2s, NULL, 132),
-    NAME_FUNC_OFFSET(1592, glVertex2sv, glVertex2sv, NULL, 133),
-    NAME_FUNC_OFFSET(1604, glVertex3d, glVertex3d, NULL, 134),
-    NAME_FUNC_OFFSET(1615, glVertex3dv, glVertex3dv, NULL, 135),
-    NAME_FUNC_OFFSET(1627, glVertex3f, glVertex3f, NULL, 136),
-    NAME_FUNC_OFFSET(1638, glVertex3fv, glVertex3fv, NULL, 137),
-    NAME_FUNC_OFFSET(1650, glVertex3i, glVertex3i, NULL, 138),
-    NAME_FUNC_OFFSET(1661, glVertex3iv, glVertex3iv, NULL, 139),
-    NAME_FUNC_OFFSET(1673, glVertex3s, glVertex3s, NULL, 140),
-    NAME_FUNC_OFFSET(1684, glVertex3sv, glVertex3sv, NULL, 141),
-    NAME_FUNC_OFFSET(1696, glVertex4d, glVertex4d, NULL, 142),
-    NAME_FUNC_OFFSET(1707, glVertex4dv, glVertex4dv, NULL, 143),
-    NAME_FUNC_OFFSET(1719, glVertex4f, glVertex4f, NULL, 144),
-    NAME_FUNC_OFFSET(1730, glVertex4fv, glVertex4fv, NULL, 145),
-    NAME_FUNC_OFFSET(1742, glVertex4i, glVertex4i, NULL, 146),
-    NAME_FUNC_OFFSET(1753, glVertex4iv, glVertex4iv, NULL, 147),
-    NAME_FUNC_OFFSET(1765, glVertex4s, glVertex4s, NULL, 148),
-    NAME_FUNC_OFFSET(1776, glVertex4sv, glVertex4sv, NULL, 149),
-    NAME_FUNC_OFFSET(1788, glClipPlane, glClipPlane, NULL, 150),
-    NAME_FUNC_OFFSET(1800, glColorMaterial, glColorMaterial, NULL, 151),
-    NAME_FUNC_OFFSET(1816, glCullFace, glCullFace, NULL, 152),
-    NAME_FUNC_OFFSET(1827, glFogf, glFogf, NULL, 153),
-    NAME_FUNC_OFFSET(1834, glFogfv, glFogfv, NULL, 154),
-    NAME_FUNC_OFFSET(1842, glFogi, glFogi, NULL, 155),
-    NAME_FUNC_OFFSET(1849, glFogiv, glFogiv, NULL, 156),
-    NAME_FUNC_OFFSET(1857, glFrontFace, glFrontFace, NULL, 157),
-    NAME_FUNC_OFFSET(1869, glHint, glHint, NULL, 158),
-    NAME_FUNC_OFFSET(1876, glLightf, glLightf, NULL, 159),
-    NAME_FUNC_OFFSET(1885, glLightfv, glLightfv, NULL, 160),
-    NAME_FUNC_OFFSET(1895, glLighti, glLighti, NULL, 161),
-    NAME_FUNC_OFFSET(1904, glLightiv, glLightiv, NULL, 162),
-    NAME_FUNC_OFFSET(1914, glLightModelf, glLightModelf, NULL, 163),
-    NAME_FUNC_OFFSET(1928, glLightModelfv, glLightModelfv, NULL, 164),
-    NAME_FUNC_OFFSET(1943, glLightModeli, glLightModeli, NULL, 165),
-    NAME_FUNC_OFFSET(1957, glLightModeliv, glLightModeliv, NULL, 166),
-    NAME_FUNC_OFFSET(1972, glLineStipple, glLineStipple, NULL, 167),
-    NAME_FUNC_OFFSET(1986, glLineWidth, glLineWidth, NULL, 168),
-    NAME_FUNC_OFFSET(1998, glMaterialf, glMaterialf, NULL, 169),
-    NAME_FUNC_OFFSET(2010, glMaterialfv, glMaterialfv, NULL, 170),
-    NAME_FUNC_OFFSET(2023, glMateriali, glMateriali, NULL, 171),
-    NAME_FUNC_OFFSET(2035, glMaterialiv, glMaterialiv, NULL, 172),
-    NAME_FUNC_OFFSET(2048, glPointSize, glPointSize, NULL, 173),
-    NAME_FUNC_OFFSET(2060, glPolygonMode, glPolygonMode, NULL, 174),
-    NAME_FUNC_OFFSET(2074, glPolygonStipple, glPolygonStipple, NULL, 175),
-    NAME_FUNC_OFFSET(2091, glScissor, glScissor, NULL, 176),
-    NAME_FUNC_OFFSET(2101, glShadeModel, glShadeModel, NULL, 177),
-    NAME_FUNC_OFFSET(2114, glTexParameterf, glTexParameterf, NULL, 178),
-    NAME_FUNC_OFFSET(2130, glTexParameterfv, glTexParameterfv, NULL, 179),
-    NAME_FUNC_OFFSET(2147, glTexParameteri, glTexParameteri, NULL, 180),
-    NAME_FUNC_OFFSET(2163, glTexParameteriv, glTexParameteriv, NULL, 181),
-    NAME_FUNC_OFFSET(2180, glTexImage1D, glTexImage1D, NULL, 182),
-    NAME_FUNC_OFFSET(2193, glTexImage2D, glTexImage2D, NULL, 183),
-    NAME_FUNC_OFFSET(2206, glTexEnvf, glTexEnvf, NULL, 184),
-    NAME_FUNC_OFFSET(2216, glTexEnvfv, glTexEnvfv, NULL, 185),
-    NAME_FUNC_OFFSET(2227, glTexEnvi, glTexEnvi, NULL, 186),
-    NAME_FUNC_OFFSET(2237, glTexEnviv, glTexEnviv, NULL, 187),
-    NAME_FUNC_OFFSET(2248, glTexGend, glTexGend, NULL, 188),
-    NAME_FUNC_OFFSET(2258, glTexGendv, glTexGendv, NULL, 189),
-    NAME_FUNC_OFFSET(2269, glTexGenf, glTexGenf, NULL, 190),
-    NAME_FUNC_OFFSET(2279, glTexGenfv, glTexGenfv, NULL, 191),
-    NAME_FUNC_OFFSET(2290, glTexGeni, glTexGeni, NULL, 192),
-    NAME_FUNC_OFFSET(2300, glTexGeniv, glTexGeniv, NULL, 193),
-    NAME_FUNC_OFFSET(2311, glFeedbackBuffer, glFeedbackBuffer, NULL, 194),
-    NAME_FUNC_OFFSET(2328, glSelectBuffer, glSelectBuffer, NULL, 195),
-    NAME_FUNC_OFFSET(2343, glRenderMode, glRenderMode, NULL, 196),
-    NAME_FUNC_OFFSET(2356, glInitNames, glInitNames, NULL, 197),
-    NAME_FUNC_OFFSET(2368, glLoadName, glLoadName, NULL, 198),
-    NAME_FUNC_OFFSET(2379, glPassThrough, glPassThrough, NULL, 199),
-    NAME_FUNC_OFFSET(2393, glPopName, glPopName, NULL, 200),
-    NAME_FUNC_OFFSET(2403, glPushName, glPushName, NULL, 201),
-    NAME_FUNC_OFFSET(2414, glDrawBuffer, glDrawBuffer, NULL, 202),
-    NAME_FUNC_OFFSET(2427, glClear, glClear, NULL, 203),
-    NAME_FUNC_OFFSET(2435, glClearAccum, glClearAccum, NULL, 204),
-    NAME_FUNC_OFFSET(2448, glClearIndex, glClearIndex, NULL, 205),
-    NAME_FUNC_OFFSET(2461, glClearColor, glClearColor, NULL, 206),
-    NAME_FUNC_OFFSET(2474, glClearStencil, glClearStencil, NULL, 207),
-    NAME_FUNC_OFFSET(2489, glClearDepth, glClearDepth, NULL, 208),
-    NAME_FUNC_OFFSET(2502, glStencilMask, glStencilMask, NULL, 209),
-    NAME_FUNC_OFFSET(2516, glColorMask, glColorMask, NULL, 210),
-    NAME_FUNC_OFFSET(2528, glDepthMask, glDepthMask, NULL, 211),
-    NAME_FUNC_OFFSET(2540, glIndexMask, glIndexMask, NULL, 212),
-    NAME_FUNC_OFFSET(2552, glAccum, glAccum, NULL, 213),
-    NAME_FUNC_OFFSET(2560, glDisable, glDisable, NULL, 214),
-    NAME_FUNC_OFFSET(2570, glEnable, glEnable, NULL, 215),
-    NAME_FUNC_OFFSET(2579, glFinish, glFinish, NULL, 216),
-    NAME_FUNC_OFFSET(2588, glFlush, glFlush, NULL, 217),
-    NAME_FUNC_OFFSET(2596, glPopAttrib, glPopAttrib, NULL, 218),
-    NAME_FUNC_OFFSET(2608, glPushAttrib, glPushAttrib, NULL, 219),
-    NAME_FUNC_OFFSET(2621, glMap1d, glMap1d, NULL, 220),
-    NAME_FUNC_OFFSET(2629, glMap1f, glMap1f, NULL, 221),
-    NAME_FUNC_OFFSET(2637, glMap2d, glMap2d, NULL, 222),
-    NAME_FUNC_OFFSET(2645, glMap2f, glMap2f, NULL, 223),
-    NAME_FUNC_OFFSET(2653, glMapGrid1d, glMapGrid1d, NULL, 224),
-    NAME_FUNC_OFFSET(2665, glMapGrid1f, glMapGrid1f, NULL, 225),
-    NAME_FUNC_OFFSET(2677, glMapGrid2d, glMapGrid2d, NULL, 226),
-    NAME_FUNC_OFFSET(2689, glMapGrid2f, glMapGrid2f, NULL, 227),
-    NAME_FUNC_OFFSET(2701, glEvalCoord1d, glEvalCoord1d, NULL, 228),
-    NAME_FUNC_OFFSET(2715, glEvalCoord1dv, glEvalCoord1dv, NULL, 229),
-    NAME_FUNC_OFFSET(2730, glEvalCoord1f, glEvalCoord1f, NULL, 230),
-    NAME_FUNC_OFFSET(2744, glEvalCoord1fv, glEvalCoord1fv, NULL, 231),
-    NAME_FUNC_OFFSET(2759, glEvalCoord2d, glEvalCoord2d, NULL, 232),
-    NAME_FUNC_OFFSET(2773, glEvalCoord2dv, glEvalCoord2dv, NULL, 233),
-    NAME_FUNC_OFFSET(2788, glEvalCoord2f, glEvalCoord2f, NULL, 234),
-    NAME_FUNC_OFFSET(2802, glEvalCoord2fv, glEvalCoord2fv, NULL, 235),
-    NAME_FUNC_OFFSET(2817, glEvalMesh1, glEvalMesh1, NULL, 236),
-    NAME_FUNC_OFFSET(2829, glEvalPoint1, glEvalPoint1, NULL, 237),
-    NAME_FUNC_OFFSET(2842, glEvalMesh2, glEvalMesh2, NULL, 238),
-    NAME_FUNC_OFFSET(2854, glEvalPoint2, glEvalPoint2, NULL, 239),
-    NAME_FUNC_OFFSET(2867, glAlphaFunc, glAlphaFunc, NULL, 240),
-    NAME_FUNC_OFFSET(2879, glBlendFunc, glBlendFunc, NULL, 241),
-    NAME_FUNC_OFFSET(2891, glLogicOp, glLogicOp, NULL, 242),
-    NAME_FUNC_OFFSET(2901, glStencilFunc, glStencilFunc, NULL, 243),
-    NAME_FUNC_OFFSET(2915, glStencilOp, glStencilOp, NULL, 244),
-    NAME_FUNC_OFFSET(2927, glDepthFunc, glDepthFunc, NULL, 245),
-    NAME_FUNC_OFFSET(2939, glPixelZoom, glPixelZoom, NULL, 246),
-    NAME_FUNC_OFFSET(2951, glPixelTransferf, glPixelTransferf, NULL, 247),
-    NAME_FUNC_OFFSET(2968, glPixelTransferi, glPixelTransferi, NULL, 248),
-    NAME_FUNC_OFFSET(2985, glPixelStoref, glPixelStoref, NULL, 249),
-    NAME_FUNC_OFFSET(2999, glPixelStorei, glPixelStorei, NULL, 250),
-    NAME_FUNC_OFFSET(3013, glPixelMapfv, glPixelMapfv, NULL, 251),
-    NAME_FUNC_OFFSET(3026, glPixelMapuiv, glPixelMapuiv, NULL, 252),
-    NAME_FUNC_OFFSET(3040, glPixelMapusv, glPixelMapusv, NULL, 253),
-    NAME_FUNC_OFFSET(3054, glReadBuffer, glReadBuffer, NULL, 254),
-    NAME_FUNC_OFFSET(3067, glCopyPixels, glCopyPixels, NULL, 255),
-    NAME_FUNC_OFFSET(3080, glReadPixels, glReadPixels, NULL, 256),
-    NAME_FUNC_OFFSET(3093, glDrawPixels, glDrawPixels, NULL, 257),
-    NAME_FUNC_OFFSET(3106, glGetBooleanv, glGetBooleanv, NULL, 258),
-    NAME_FUNC_OFFSET(3120, glGetClipPlane, glGetClipPlane, NULL, 259),
-    NAME_FUNC_OFFSET(3135, glGetDoublev, glGetDoublev, NULL, 260),
-    NAME_FUNC_OFFSET(3148, glGetError, glGetError, NULL, 261),
-    NAME_FUNC_OFFSET(3159, glGetFloatv, glGetFloatv, NULL, 262),
-    NAME_FUNC_OFFSET(3171, glGetIntegerv, glGetIntegerv, NULL, 263),
-    NAME_FUNC_OFFSET(3185, glGetLightfv, glGetLightfv, NULL, 264),
-    NAME_FUNC_OFFSET(3198, glGetLightiv, glGetLightiv, NULL, 265),
-    NAME_FUNC_OFFSET(3211, glGetMapdv, glGetMapdv, NULL, 266),
-    NAME_FUNC_OFFSET(3222, glGetMapfv, glGetMapfv, NULL, 267),
-    NAME_FUNC_OFFSET(3233, glGetMapiv, glGetMapiv, NULL, 268),
-    NAME_FUNC_OFFSET(3244, glGetMaterialfv, glGetMaterialfv, NULL, 269),
-    NAME_FUNC_OFFSET(3260, glGetMaterialiv, glGetMaterialiv, NULL, 270),
-    NAME_FUNC_OFFSET(3276, glGetPixelMapfv, glGetPixelMapfv, NULL, 271),
-    NAME_FUNC_OFFSET(3292, glGetPixelMapuiv, glGetPixelMapuiv, NULL, 272),
-    NAME_FUNC_OFFSET(3309, glGetPixelMapusv, glGetPixelMapusv, NULL, 273),
-    NAME_FUNC_OFFSET(3326, glGetPolygonStipple, glGetPolygonStipple, NULL, 274),
-    NAME_FUNC_OFFSET(3346, glGetString, glGetString, NULL, 275),
-    NAME_FUNC_OFFSET(3358, glGetTexEnvfv, glGetTexEnvfv, NULL, 276),
-    NAME_FUNC_OFFSET(3372, glGetTexEnviv, glGetTexEnviv, NULL, 277),
-    NAME_FUNC_OFFSET(3386, glGetTexGendv, glGetTexGendv, NULL, 278),
-    NAME_FUNC_OFFSET(3400, glGetTexGenfv, glGetTexGenfv, NULL, 279),
-    NAME_FUNC_OFFSET(3414, glGetTexGeniv, glGetTexGeniv, NULL, 280),
-    NAME_FUNC_OFFSET(3428, glGetTexImage, glGetTexImage, NULL, 281),
-    NAME_FUNC_OFFSET(3442, glGetTexParameterfv, glGetTexParameterfv, NULL, 282),
-    NAME_FUNC_OFFSET(3462, glGetTexParameteriv, glGetTexParameteriv, NULL, 283),
-    NAME_FUNC_OFFSET(3482, glGetTexLevelParameterfv, glGetTexLevelParameterfv,
-                     NULL, 284),
-    NAME_FUNC_OFFSET(3507, glGetTexLevelParameteriv, glGetTexLevelParameteriv,
-                     NULL, 285),
-    NAME_FUNC_OFFSET(3532, glIsEnabled, glIsEnabled, NULL, 286),
-    NAME_FUNC_OFFSET(3544, glIsList, glIsList, NULL, 287),
-    NAME_FUNC_OFFSET(3553, glDepthRange, glDepthRange, NULL, 288),
-    NAME_FUNC_OFFSET(3566, glFrustum, glFrustum, NULL, 289),
-    NAME_FUNC_OFFSET(3576, glLoadIdentity, glLoadIdentity, NULL, 290),
-    NAME_FUNC_OFFSET(3591, glLoadMatrixf, glLoadMatrixf, NULL, 291),
-    NAME_FUNC_OFFSET(3605, glLoadMatrixd, glLoadMatrixd, NULL, 292),
-    NAME_FUNC_OFFSET(3619, glMatrixMode, glMatrixMode, NULL, 293),
-    NAME_FUNC_OFFSET(3632, glMultMatrixf, glMultMatrixf, NULL, 294),
-    NAME_FUNC_OFFSET(3646, glMultMatrixd, glMultMatrixd, NULL, 295),
-    NAME_FUNC_OFFSET(3660, glOrtho, glOrtho, NULL, 296),
-    NAME_FUNC_OFFSET(3668, glPopMatrix, glPopMatrix, NULL, 297),
-    NAME_FUNC_OFFSET(3680, glPushMatrix, glPushMatrix, NULL, 298),
-    NAME_FUNC_OFFSET(3693, glRotated, glRotated, NULL, 299),
-    NAME_FUNC_OFFSET(3703, glRotatef, glRotatef, NULL, 300),
-    NAME_FUNC_OFFSET(3713, glScaled, glScaled, NULL, 301),
-    NAME_FUNC_OFFSET(3722, glScalef, glScalef, NULL, 302),
-    NAME_FUNC_OFFSET(3731, glTranslated, glTranslated, NULL, 303),
-    NAME_FUNC_OFFSET(3744, glTranslatef, glTranslatef, NULL, 304),
-    NAME_FUNC_OFFSET(3757, glViewport, glViewport, NULL, 305),
-    NAME_FUNC_OFFSET(3768, glArrayElement, glArrayElement, NULL, 306),
-    NAME_FUNC_OFFSET(3783, glBindTexture, glBindTexture, NULL, 307),
-    NAME_FUNC_OFFSET(3797, glColorPointer, glColorPointer, NULL, 308),
-    NAME_FUNC_OFFSET(3812, glDisableClientState, glDisableClientState, NULL,
-                     309),
-    NAME_FUNC_OFFSET(3833, glDrawArrays, glDrawArrays, NULL, 310),
-    NAME_FUNC_OFFSET(3846, glDrawElements, glDrawElements, NULL, 311),
-    NAME_FUNC_OFFSET(3861, glEdgeFlagPointer, glEdgeFlagPointer, NULL, 312),
-    NAME_FUNC_OFFSET(3879, glEnableClientState, glEnableClientState, NULL, 313),
-    NAME_FUNC_OFFSET(3899, glIndexPointer, glIndexPointer, NULL, 314),
-    NAME_FUNC_OFFSET(3914, glIndexub, glIndexub, NULL, 315),
-    NAME_FUNC_OFFSET(3924, glIndexubv, glIndexubv, NULL, 316),
-    NAME_FUNC_OFFSET(3935, glInterleavedArrays, glInterleavedArrays, NULL, 317),
-    NAME_FUNC_OFFSET(3955, glNormalPointer, glNormalPointer, NULL, 318),
-    NAME_FUNC_OFFSET(3971, glPolygonOffset, glPolygonOffset, NULL, 319),
-    NAME_FUNC_OFFSET(3987, glTexCoordPointer, glTexCoordPointer, NULL, 320),
-    NAME_FUNC_OFFSET(4005, glVertexPointer, glVertexPointer, NULL, 321),
-    NAME_FUNC_OFFSET(4021, glAreTexturesResident, glAreTexturesResident, NULL,
-                     322),
-    NAME_FUNC_OFFSET(4043, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
-    NAME_FUNC_OFFSET(4060, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
-    NAME_FUNC_OFFSET(4077, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
-    NAME_FUNC_OFFSET(4097, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
-    NAME_FUNC_OFFSET(4117, glDeleteTextures, glDeleteTextures, NULL, 327),
-    NAME_FUNC_OFFSET(4134, glGenTextures, glGenTextures, NULL, 328),
-    NAME_FUNC_OFFSET(4148, glGetPointerv, glGetPointerv, NULL, 329),
-    NAME_FUNC_OFFSET(4162, glIsTexture, glIsTexture, NULL, 330),
-    NAME_FUNC_OFFSET(4174, glPrioritizeTextures, glPrioritizeTextures, NULL,
-                     331),
-    NAME_FUNC_OFFSET(4195, glTexSubImage1D, glTexSubImage1D, NULL, 332),
-    NAME_FUNC_OFFSET(4211, glTexSubImage2D, glTexSubImage2D, NULL, 333),
-    NAME_FUNC_OFFSET(4227, glPopClientAttrib, glPopClientAttrib, NULL, 334),
-    NAME_FUNC_OFFSET(4245, glPushClientAttrib, glPushClientAttrib, NULL, 335),
-    NAME_FUNC_OFFSET(4264, glBlendColor, glBlendColor, NULL, 336),
-    NAME_FUNC_OFFSET(4277, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(4293, glDrawRangeElements, glDrawRangeElements, NULL, 338),
-    NAME_FUNC_OFFSET(4313, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(4326, glColorTableParameterfv, glColorTableParameterfv,
-                     NULL, 340),
-    NAME_FUNC_OFFSET(4350, glColorTableParameteriv, glColorTableParameteriv,
-                     NULL, 341),
-    NAME_FUNC_OFFSET(4374, glCopyColorTable, glCopyColorTable, NULL, 342),
-    NAME_FUNC_OFFSET(4391, glGetColorTable, glGetColorTable, NULL, 343),
-    NAME_FUNC_OFFSET(4407, glGetColorTableParameterfv,
-                     glGetColorTableParameterfv, NULL, 344),
-    NAME_FUNC_OFFSET(4434, glGetColorTableParameteriv,
-                     glGetColorTableParameteriv, NULL, 345),
-    NAME_FUNC_OFFSET(4461, glColorSubTable, glColorSubTable, NULL, 346),
-    NAME_FUNC_OFFSET(4477, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
-    NAME_FUNC_OFFSET(4497, glConvolutionFilter1D, glConvolutionFilter1D, NULL,
-                     348),
-    NAME_FUNC_OFFSET(4519, glConvolutionFilter2D, glConvolutionFilter2D, NULL,
-                     349),
-    NAME_FUNC_OFFSET(4541, glConvolutionParameterf, glConvolutionParameterf,
-                     NULL, 350),
-    NAME_FUNC_OFFSET(4565, glConvolutionParameterfv, glConvolutionParameterfv,
-                     NULL, 351),
-    NAME_FUNC_OFFSET(4590, glConvolutionParameteri, glConvolutionParameteri,
-                     NULL, 352),
-    NAME_FUNC_OFFSET(4614, glConvolutionParameteriv, glConvolutionParameteriv,
-                     NULL, 353),
-    NAME_FUNC_OFFSET(4639, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D,
-                     NULL, 354),
-    NAME_FUNC_OFFSET(4665, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D,
-                     NULL, 355),
-    NAME_FUNC_OFFSET(4691, glGetConvolutionFilter, glGetConvolutionFilter, NULL,
-                     356),
-    NAME_FUNC_OFFSET(4714, glGetConvolutionParameterfv,
-                     glGetConvolutionParameterfv, NULL, 357),
-    NAME_FUNC_OFFSET(4742, glGetConvolutionParameteriv,
-                     glGetConvolutionParameteriv, NULL, 358),
-    NAME_FUNC_OFFSET(4770, glGetSeparableFilter, glGetSeparableFilter, NULL,
-                     359),
-    NAME_FUNC_OFFSET(4791, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
-    NAME_FUNC_OFFSET(4811, glGetHistogram, glGetHistogram, NULL, 361),
-    NAME_FUNC_OFFSET(4826, glGetHistogramParameterfv, glGetHistogramParameterfv,
-                     NULL, 362),
-    NAME_FUNC_OFFSET(4852, glGetHistogramParameteriv, glGetHistogramParameteriv,
-                     NULL, 363),
-    NAME_FUNC_OFFSET(4878, glGetMinmax, glGetMinmax, NULL, 364),
-    NAME_FUNC_OFFSET(4890, glGetMinmaxParameterfv, glGetMinmaxParameterfv, NULL,
-                     365),
-    NAME_FUNC_OFFSET(4913, glGetMinmaxParameteriv, glGetMinmaxParameteriv, NULL,
-                     366),
-    NAME_FUNC_OFFSET(4936, glHistogram, glHistogram, NULL, 367),
-    NAME_FUNC_OFFSET(4948, glMinmax, glMinmax, NULL, 368),
-    NAME_FUNC_OFFSET(4957, glResetHistogram, glResetHistogram, NULL, 369),
-    NAME_FUNC_OFFSET(4974, glResetMinmax, glResetMinmax, NULL, 370),
-    NAME_FUNC_OFFSET(4988, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(5001, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(5017, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(5037, glActiveTextureARB, glActiveTextureARB, NULL, 374),
-    NAME_FUNC_OFFSET(5056, glClientActiveTextureARB, glClientActiveTextureARB,
-                     NULL, 375),
-    NAME_FUNC_OFFSET(5081, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL,
-                     376),
-    NAME_FUNC_OFFSET(5102, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL,
-                     377),
-    NAME_FUNC_OFFSET(5124, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL,
-                     378),
-    NAME_FUNC_OFFSET(5145, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL,
-                     379),
-    NAME_FUNC_OFFSET(5167, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL,
-                     380),
-    NAME_FUNC_OFFSET(5188, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL,
-                     381),
-    NAME_FUNC_OFFSET(5210, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL,
-                     382),
-    NAME_FUNC_OFFSET(5231, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL,
-                     383),
-    NAME_FUNC_OFFSET(5253, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL,
-                     384),
-    NAME_FUNC_OFFSET(5274, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL,
-                     385),
-    NAME_FUNC_OFFSET(5296, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL,
-                     386),
-    NAME_FUNC_OFFSET(5317, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL,
-                     387),
-    NAME_FUNC_OFFSET(5339, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL,
-                     388),
-    NAME_FUNC_OFFSET(5360, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL,
-                     389),
-    NAME_FUNC_OFFSET(5382, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL,
-                     390),
-    NAME_FUNC_OFFSET(5403, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL,
-                     391),
-    NAME_FUNC_OFFSET(5425, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL,
-                     392),
-    NAME_FUNC_OFFSET(5446, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL,
-                     393),
-    NAME_FUNC_OFFSET(5468, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL,
-                     394),
-    NAME_FUNC_OFFSET(5489, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL,
-                     395),
-    NAME_FUNC_OFFSET(5511, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL,
-                     396),
-    NAME_FUNC_OFFSET(5532, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL,
-                     397),
-    NAME_FUNC_OFFSET(5554, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL,
-                     398),
-    NAME_FUNC_OFFSET(5575, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL,
-                     399),
-    NAME_FUNC_OFFSET(5597, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL,
-                     400),
-    NAME_FUNC_OFFSET(5618, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL,
-                     401),
-    NAME_FUNC_OFFSET(5640, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL,
-                     402),
-    NAME_FUNC_OFFSET(5661, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL,
-                     403),
-    NAME_FUNC_OFFSET(5683, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL,
-                     404),
-    NAME_FUNC_OFFSET(5704, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL,
-                     405),
-    NAME_FUNC_OFFSET(5726, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL,
-                     406),
-    NAME_FUNC_OFFSET(5747, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL,
-                     407),
-    NAME_FUNC_OFFSET(5769, glAttachShader, glAttachShader, NULL, 408),
-    NAME_FUNC_OFFSET(5784, glCreateProgram, glCreateProgram, NULL, 409),
-    NAME_FUNC_OFFSET(5800, glCreateShader, glCreateShader, NULL, 410),
-    NAME_FUNC_OFFSET(5815, glDeleteProgram, glDeleteProgram, NULL, 411),
-    NAME_FUNC_OFFSET(5831, glDeleteShader, glDeleteShader, NULL, 412),
-    NAME_FUNC_OFFSET(5846, glDetachShader, glDetachShader, NULL, 413),
-    NAME_FUNC_OFFSET(5861, glGetAttachedShaders, glGetAttachedShaders, NULL,
-                     414),
-    NAME_FUNC_OFFSET(5882, glGetProgramInfoLog, glGetProgramInfoLog, NULL, 415),
-    NAME_FUNC_OFFSET(5902, glGetProgramiv, glGetProgramiv, NULL, 416),
-    NAME_FUNC_OFFSET(5917, glGetShaderInfoLog, glGetShaderInfoLog, NULL, 417),
-    NAME_FUNC_OFFSET(5936, glGetShaderiv, glGetShaderiv, NULL, 418),
-    NAME_FUNC_OFFSET(5950, glIsProgram, glIsProgram, NULL, 419),
-    NAME_FUNC_OFFSET(5962, glIsShader, glIsShader, NULL, 420),
-    NAME_FUNC_OFFSET(5973, glStencilFuncSeparate, glStencilFuncSeparate, NULL,
-                     421),
-    NAME_FUNC_OFFSET(5995, glStencilMaskSeparate, glStencilMaskSeparate, NULL,
-                     422),
-    NAME_FUNC_OFFSET(6017, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
-    NAME_FUNC_OFFSET(6037, glUniformMatrix2x3fv, glUniformMatrix2x3fv, NULL,
-                     424),
-    NAME_FUNC_OFFSET(6058, glUniformMatrix2x4fv, glUniformMatrix2x4fv, NULL,
-                     425),
-    NAME_FUNC_OFFSET(6079, glUniformMatrix3x2fv, glUniformMatrix3x2fv, NULL,
-                     426),
-    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, glTexBuffer, glTexBuffer, NULL, 436),
-    NAME_FUNC_OFFSET(6266, glFramebufferTexture, glFramebufferTexture, NULL,
-                     437),
-    NAME_FUNC_OFFSET(6287, glGetBufferParameteri64v, glGetBufferParameteri64v,
-                     NULL, 438),
-    NAME_FUNC_OFFSET(6312, glGetInteger64i_v, glGetInteger64i_v, NULL, 439),
-    NAME_FUNC_OFFSET(6330, glVertexAttribDivisor, glVertexAttribDivisor, NULL,
-                     440),
-    NAME_FUNC_OFFSET(6352, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB,
-                     NULL, 441),
-    NAME_FUNC_OFFSET(6378, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB,
-                     NULL, 442),
-    NAME_FUNC_OFFSET(6404, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB,
-                     NULL, 443),
-    NAME_FUNC_OFFSET(6430, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB,
-                     NULL, 444),
-    NAME_FUNC_OFFSET(6456, glSampleCoverageARB, glSampleCoverageARB, NULL, 445),
-    NAME_FUNC_OFFSET(6476, glCompressedTexImage1DARB, glCompressedTexImage1DARB,
-                     NULL, 446),
-    NAME_FUNC_OFFSET(6502, glCompressedTexImage2DARB, glCompressedTexImage2DARB,
-                     NULL, 447),
-    NAME_FUNC_OFFSET(6528, glCompressedTexImage3DARB, glCompressedTexImage3DARB,
-                     NULL, 448),
-    NAME_FUNC_OFFSET(6554, glCompressedTexSubImage1DARB,
-                     glCompressedTexSubImage1DARB, NULL, 449),
-    NAME_FUNC_OFFSET(6583, glCompressedTexSubImage2DARB,
-                     glCompressedTexSubImage2DARB, NULL, 450),
-    NAME_FUNC_OFFSET(6612, glCompressedTexSubImage3DARB,
-                     glCompressedTexSubImage3DARB, NULL, 451),
-    NAME_FUNC_OFFSET(6641, glGetCompressedTexImageARB,
-                     glGetCompressedTexImageARB, NULL, 452),
-    NAME_FUNC_OFFSET(6668, glDisableVertexAttribArrayARB,
-                     glDisableVertexAttribArrayARB, NULL, 453),
-    NAME_FUNC_OFFSET(6698, glEnableVertexAttribArrayARB,
-                     glEnableVertexAttribArrayARB, NULL, 454),
-    NAME_FUNC_OFFSET(6727, glGetProgramEnvParameterdvARB,
-                     glGetProgramEnvParameterdvARB, NULL, 455),
-    NAME_FUNC_OFFSET(6757, glGetProgramEnvParameterfvARB,
-                     glGetProgramEnvParameterfvARB, NULL, 456),
-    NAME_FUNC_OFFSET(6787, glGetProgramLocalParameterdvARB,
-                     glGetProgramLocalParameterdvARB, NULL, 457),
-    NAME_FUNC_OFFSET(6819, glGetProgramLocalParameterfvARB,
-                     glGetProgramLocalParameterfvARB, NULL, 458),
-    NAME_FUNC_OFFSET(6851, glGetProgramStringARB, glGetProgramStringARB, NULL,
-                     459),
-    NAME_FUNC_OFFSET(6873, glGetProgramivARB, glGetProgramivARB, NULL, 460),
-    NAME_FUNC_OFFSET(6891, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL,
-                     461),
-    NAME_FUNC_OFFSET(6914, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL,
-                     462),
-    NAME_FUNC_OFFSET(6937, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL,
-                     463),
-    NAME_FUNC_OFFSET(6960, glProgramEnvParameter4dARB,
-                     glProgramEnvParameter4dARB, NULL, 464),
-    NAME_FUNC_OFFSET(6987, glProgramEnvParameter4dvARB,
-                     glProgramEnvParameter4dvARB, NULL, 465),
-    NAME_FUNC_OFFSET(7015, glProgramEnvParameter4fARB,
-                     glProgramEnvParameter4fARB, NULL, 466),
-    NAME_FUNC_OFFSET(7042, glProgramEnvParameter4fvARB,
-                     glProgramEnvParameter4fvARB, NULL, 467),
-    NAME_FUNC_OFFSET(7070, glProgramLocalParameter4dARB,
-                     glProgramLocalParameter4dARB, NULL, 468),
-    NAME_FUNC_OFFSET(7099, glProgramLocalParameter4dvARB,
-                     glProgramLocalParameter4dvARB, NULL, 469),
-    NAME_FUNC_OFFSET(7129, glProgramLocalParameter4fARB,
-                     glProgramLocalParameter4fARB, NULL, 470),
-    NAME_FUNC_OFFSET(7158, glProgramLocalParameter4fvARB,
-                     glProgramLocalParameter4fvARB, NULL, 471),
-    NAME_FUNC_OFFSET(7188, glProgramStringARB, glProgramStringARB, NULL, 472),
-    NAME_FUNC_OFFSET(7207, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 473),
-    NAME_FUNC_OFFSET(7227, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL,
-                     474),
-    NAME_FUNC_OFFSET(7248, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 475),
-    NAME_FUNC_OFFSET(7268, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL,
-                     476),
-    NAME_FUNC_OFFSET(7289, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 477),
-    NAME_FUNC_OFFSET(7309, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL,
-                     478),
-    NAME_FUNC_OFFSET(7330, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 479),
-    NAME_FUNC_OFFSET(7350, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL,
-                     480),
-    NAME_FUNC_OFFSET(7371, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 481),
-    NAME_FUNC_OFFSET(7391, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL,
-                     482),
-    NAME_FUNC_OFFSET(7412, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 483),
-    NAME_FUNC_OFFSET(7432, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL,
-                     484),
-    NAME_FUNC_OFFSET(7453, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 485),
-    NAME_FUNC_OFFSET(7473, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL,
-                     486),
-    NAME_FUNC_OFFSET(7494, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 487),
-    NAME_FUNC_OFFSET(7514, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL,
-                     488),
-    NAME_FUNC_OFFSET(7535, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 489),
-    NAME_FUNC_OFFSET(7555, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL,
-                     490),
-    NAME_FUNC_OFFSET(7576, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL,
-                     491),
-    NAME_FUNC_OFFSET(7598, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL,
-                     492),
-    NAME_FUNC_OFFSET(7620, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL,
-                     493),
-    NAME_FUNC_OFFSET(7642, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL,
-                     494),
-    NAME_FUNC_OFFSET(7664, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL,
-                     495),
-    NAME_FUNC_OFFSET(7687, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL,
-                     496),
-    NAME_FUNC_OFFSET(7710, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL,
-                     497),
-    NAME_FUNC_OFFSET(7733, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL,
-                     498),
-    NAME_FUNC_OFFSET(7754, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 499),
-    NAME_FUNC_OFFSET(7774, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL,
-                     500),
-    NAME_FUNC_OFFSET(7795, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 501),
-    NAME_FUNC_OFFSET(7815, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL,
-                     502),
-    NAME_FUNC_OFFSET(7836, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL,
-                     503),
-    NAME_FUNC_OFFSET(7857, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 504),
-    NAME_FUNC_OFFSET(7877, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL,
-                     505),
-    NAME_FUNC_OFFSET(7898, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL,
-                     506),
-    NAME_FUNC_OFFSET(7920, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL,
-                     507),
-    NAME_FUNC_OFFSET(7942, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL,
-                     508),
-    NAME_FUNC_OFFSET(7964, glVertexAttribPointerARB, glVertexAttribPointerARB,
-                     NULL, 509),
-    NAME_FUNC_OFFSET(7989, glBindBufferARB, glBindBufferARB, NULL, 510),
-    NAME_FUNC_OFFSET(8005, glBufferDataARB, glBufferDataARB, NULL, 511),
-    NAME_FUNC_OFFSET(8021, glBufferSubDataARB, glBufferSubDataARB, NULL, 512),
-    NAME_FUNC_OFFSET(8040, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 513),
-    NAME_FUNC_OFFSET(8059, glGenBuffersARB, glGenBuffersARB, NULL, 514),
-    NAME_FUNC_OFFSET(8075, glGetBufferParameterivARB, glGetBufferParameterivARB,
-                     NULL, 515),
-    NAME_FUNC_OFFSET(8101, glGetBufferPointervARB, glGetBufferPointervARB, NULL,
-                     516),
-    NAME_FUNC_OFFSET(8124, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL,
-                     517),
-    NAME_FUNC_OFFSET(8146, glIsBufferARB, glIsBufferARB, NULL, 518),
-    NAME_FUNC_OFFSET(8160, glMapBufferARB, glMapBufferARB, NULL, 519),
-    NAME_FUNC_OFFSET(8175, glUnmapBufferARB, glUnmapBufferARB, NULL, 520),
-    NAME_FUNC_OFFSET(8192, glBeginQueryARB, glBeginQueryARB, NULL, 521),
-    NAME_FUNC_OFFSET(8208, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 522),
-    NAME_FUNC_OFFSET(8227, glEndQueryARB, glEndQueryARB, NULL, 523),
-    NAME_FUNC_OFFSET(8241, glGenQueriesARB, glGenQueriesARB, NULL, 524),
-    NAME_FUNC_OFFSET(8257, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL,
-                     525),
-    NAME_FUNC_OFFSET(8279, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL,
-                     526),
-    NAME_FUNC_OFFSET(8302, glGetQueryivARB, glGetQueryivARB, NULL, 527),
-    NAME_FUNC_OFFSET(8318, glIsQueryARB, glIsQueryARB, NULL, 528),
-    NAME_FUNC_OFFSET(8331, glAttachObjectARB, glAttachObjectARB, NULL, 529),
-    NAME_FUNC_OFFSET(8349, glCompileShaderARB, glCompileShaderARB, NULL, 530),
-    NAME_FUNC_OFFSET(8368, glCreateProgramObjectARB, glCreateProgramObjectARB,
-                     NULL, 531),
-    NAME_FUNC_OFFSET(8393, glCreateShaderObjectARB, glCreateShaderObjectARB,
-                     NULL, 532),
-    NAME_FUNC_OFFSET(8417, glDeleteObjectARB, glDeleteObjectARB, NULL, 533),
-    NAME_FUNC_OFFSET(8435, glDetachObjectARB, glDetachObjectARB, NULL, 534),
-    NAME_FUNC_OFFSET(8453, glGetActiveUniformARB, glGetActiveUniformARB, NULL,
-                     535),
-    NAME_FUNC_OFFSET(8475, glGetAttachedObjectsARB, glGetAttachedObjectsARB,
-                     NULL, 536),
-    NAME_FUNC_OFFSET(8499, glGetHandleARB, glGetHandleARB, NULL, 537),
-    NAME_FUNC_OFFSET(8514, glGetInfoLogARB, glGetInfoLogARB, NULL, 538),
-    NAME_FUNC_OFFSET(8530, glGetObjectParameterfvARB, glGetObjectParameterfvARB,
-                     NULL, 539),
-    NAME_FUNC_OFFSET(8556, glGetObjectParameterivARB, glGetObjectParameterivARB,
-                     NULL, 540),
-    NAME_FUNC_OFFSET(8582, glGetShaderSourceARB, glGetShaderSourceARB, NULL,
-                     541),
-    NAME_FUNC_OFFSET(8603, glGetUniformLocationARB, glGetUniformLocationARB,
-                     NULL, 542),
-    NAME_FUNC_OFFSET(8627, glGetUniformfvARB, glGetUniformfvARB, NULL, 543),
-    NAME_FUNC_OFFSET(8645, glGetUniformivARB, glGetUniformivARB, NULL, 544),
-    NAME_FUNC_OFFSET(8663, glLinkProgramARB, glLinkProgramARB, NULL, 545),
-    NAME_FUNC_OFFSET(8680, glShaderSourceARB, glShaderSourceARB, NULL, 546),
-    NAME_FUNC_OFFSET(8698, glUniform1fARB, glUniform1fARB, NULL, 547),
-    NAME_FUNC_OFFSET(8713, glUniform1fvARB, glUniform1fvARB, NULL, 548),
-    NAME_FUNC_OFFSET(8729, glUniform1iARB, glUniform1iARB, NULL, 549),
-    NAME_FUNC_OFFSET(8744, glUniform1ivARB, glUniform1ivARB, NULL, 550),
-    NAME_FUNC_OFFSET(8760, glUniform2fARB, glUniform2fARB, NULL, 551),
-    NAME_FUNC_OFFSET(8775, glUniform2fvARB, glUniform2fvARB, NULL, 552),
-    NAME_FUNC_OFFSET(8791, glUniform2iARB, glUniform2iARB, NULL, 553),
-    NAME_FUNC_OFFSET(8806, glUniform2ivARB, glUniform2ivARB, NULL, 554),
-    NAME_FUNC_OFFSET(8822, glUniform3fARB, glUniform3fARB, NULL, 555),
-    NAME_FUNC_OFFSET(8837, glUniform3fvARB, glUniform3fvARB, NULL, 556),
-    NAME_FUNC_OFFSET(8853, glUniform3iARB, glUniform3iARB, NULL, 557),
-    NAME_FUNC_OFFSET(8868, glUniform3ivARB, glUniform3ivARB, NULL, 558),
-    NAME_FUNC_OFFSET(8884, glUniform4fARB, glUniform4fARB, NULL, 559),
-    NAME_FUNC_OFFSET(8899, glUniform4fvARB, glUniform4fvARB, NULL, 560),
-    NAME_FUNC_OFFSET(8915, glUniform4iARB, glUniform4iARB, NULL, 561),
-    NAME_FUNC_OFFSET(8930, glUniform4ivARB, glUniform4ivARB, NULL, 562),
-    NAME_FUNC_OFFSET(8946, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL,
-                     563),
-    NAME_FUNC_OFFSET(8968, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL,
-                     564),
-    NAME_FUNC_OFFSET(8990, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL,
-                     565),
-    NAME_FUNC_OFFSET(9012, glUseProgramObjectARB, glUseProgramObjectARB, NULL,
-                     566),
-    NAME_FUNC_OFFSET(9034, glValidateProgramARB, glValidateProgramARB, NULL,
-                     567),
-    NAME_FUNC_OFFSET(9055, glBindAttribLocationARB, glBindAttribLocationARB,
-                     NULL, 568),
-    NAME_FUNC_OFFSET(9079, glGetActiveAttribARB, glGetActiveAttribARB, NULL,
-                     569),
-    NAME_FUNC_OFFSET(9100, glGetAttribLocationARB, glGetAttribLocationARB, NULL,
-                     570),
-    NAME_FUNC_OFFSET(9123, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(9140, glClampColorARB, glClampColorARB, NULL, 572),
-    NAME_FUNC_OFFSET(9156, glDrawArraysInstancedARB, glDrawArraysInstancedARB,
-                     NULL, 573),
-    NAME_FUNC_OFFSET(9181, glDrawElementsInstancedARB,
-                     glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(9208, glRenderbufferStorageMultisample,
-                     glRenderbufferStorageMultisample, NULL, 575),
-    NAME_FUNC_OFFSET(9241, glFramebufferTextureARB, glFramebufferTextureARB,
-                     NULL, 576),
-    NAME_FUNC_OFFSET(9265, glFramebufferTextureFaceARB,
-                     glFramebufferTextureFaceARB, NULL, 577),
-    NAME_FUNC_OFFSET(9293, glProgramParameteriARB, glProgramParameteriARB, NULL,
-                     578),
-    NAME_FUNC_OFFSET(9316, glVertexAttribDivisorARB, glVertexAttribDivisorARB,
-                     NULL, 579),
-    NAME_FUNC_OFFSET(9341, glFlushMappedBufferRange, glFlushMappedBufferRange,
-                     NULL, 580),
-    NAME_FUNC_OFFSET(9366, glMapBufferRange, glMapBufferRange, NULL, 581),
-    NAME_FUNC_OFFSET(9383, glTexBufferARB, glTexBufferARB, NULL, 582),
-    NAME_FUNC_OFFSET(9398, glBindVertexArray, glBindVertexArray, NULL, 583),
-    NAME_FUNC_OFFSET(9416, glGenVertexArrays, glGenVertexArrays, NULL, 584),
-    NAME_FUNC_OFFSET(9434, glCopyBufferSubData, glCopyBufferSubData, NULL, 585),
-    NAME_FUNC_OFFSET(9454, glClientWaitSync, glClientWaitSync, NULL, 586),
-    NAME_FUNC_OFFSET(9471, glDeleteSync, glDeleteSync, NULL, 587),
-    NAME_FUNC_OFFSET(9484, glFenceSync, glFenceSync, NULL, 588),
-    NAME_FUNC_OFFSET(9496, glGetInteger64v, glGetInteger64v, NULL, 589),
-    NAME_FUNC_OFFSET(9512, glGetSynciv, glGetSynciv, NULL, 590),
-    NAME_FUNC_OFFSET(9524, glIsSync, glIsSync, NULL, 591),
-    NAME_FUNC_OFFSET(9533, glWaitSync, glWaitSync, NULL, 592),
-    NAME_FUNC_OFFSET(9544, glDrawElementsBaseVertex, glDrawElementsBaseVertex,
-                     NULL, 593),
-    NAME_FUNC_OFFSET(9569, glDrawElementsInstancedBaseVertex,
-                     glDrawElementsInstancedBaseVertex, NULL, 594),
-    NAME_FUNC_OFFSET(9603, glDrawRangeElementsBaseVertex,
-                     glDrawRangeElementsBaseVertex, NULL, 595),
-    NAME_FUNC_OFFSET(9633, glMultiDrawElementsBaseVertex,
-                     glMultiDrawElementsBaseVertex, NULL, 596),
-    NAME_FUNC_OFFSET(9663, glBlendEquationSeparateiARB,
-                     glBlendEquationSeparateiARB, NULL, 597),
-    NAME_FUNC_OFFSET(9691, glBlendEquationiARB, glBlendEquationiARB, NULL, 598),
-    NAME_FUNC_OFFSET(9711, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB,
-                     NULL, 599),
-    NAME_FUNC_OFFSET(9735, glBlendFunciARB, glBlendFunciARB, NULL, 600),
-    NAME_FUNC_OFFSET(9751, glBindSampler, glBindSampler, NULL, 601),
-    NAME_FUNC_OFFSET(9765, glDeleteSamplers, glDeleteSamplers, NULL, 602),
-    NAME_FUNC_OFFSET(9782, glGenSamplers, glGenSamplers, NULL, 603),
-    NAME_FUNC_OFFSET(9796, glGetSamplerParameterIiv, glGetSamplerParameterIiv,
-                     NULL, 604),
-    NAME_FUNC_OFFSET(9821, glGetSamplerParameterIuiv, glGetSamplerParameterIuiv,
-                     NULL, 605),
-    NAME_FUNC_OFFSET(9847, glGetSamplerParameterfv, glGetSamplerParameterfv,
-                     NULL, 606),
-    NAME_FUNC_OFFSET(9871, glGetSamplerParameteriv, glGetSamplerParameteriv,
-                     NULL, 607),
-    NAME_FUNC_OFFSET(9895, glIsSampler, glIsSampler, NULL, 608),
-    NAME_FUNC_OFFSET(9907, glSamplerParameterIiv, glSamplerParameterIiv, NULL,
-                     609),
-    NAME_FUNC_OFFSET(9929, glSamplerParameterIuiv, glSamplerParameterIuiv, NULL,
-                     610),
-    NAME_FUNC_OFFSET(9952, glSamplerParameterf, glSamplerParameterf, NULL, 611),
-    NAME_FUNC_OFFSET(9972, glSamplerParameterfv, glSamplerParameterfv, NULL,
-                     612),
-    NAME_FUNC_OFFSET(9993, glSamplerParameteri, glSamplerParameteri, NULL, 613),
-    NAME_FUNC_OFFSET(10013, glSamplerParameteriv, glSamplerParameteriv, NULL,
-                     614),
-    NAME_FUNC_OFFSET(10034, glColorP3ui, glColorP3ui, NULL, 615),
-    NAME_FUNC_OFFSET(10046, glColorP3uiv, glColorP3uiv, NULL, 616),
-    NAME_FUNC_OFFSET(10059, glColorP4ui, glColorP4ui, NULL, 617),
-    NAME_FUNC_OFFSET(10071, glColorP4uiv, glColorP4uiv, NULL, 618),
-    NAME_FUNC_OFFSET(10084, glMultiTexCoordP1ui, glMultiTexCoordP1ui, NULL,
-                     619),
-    NAME_FUNC_OFFSET(10104, glMultiTexCoordP1uiv, glMultiTexCoordP1uiv, NULL,
-                     620),
-    NAME_FUNC_OFFSET(10125, glMultiTexCoordP2ui, glMultiTexCoordP2ui, NULL,
-                     621),
-    NAME_FUNC_OFFSET(10145, glMultiTexCoordP2uiv, glMultiTexCoordP2uiv, NULL,
-                     622),
-    NAME_FUNC_OFFSET(10166, glMultiTexCoordP3ui, glMultiTexCoordP3ui, NULL,
-                     623),
-    NAME_FUNC_OFFSET(10186, glMultiTexCoordP3uiv, glMultiTexCoordP3uiv, NULL,
-                     624),
-    NAME_FUNC_OFFSET(10207, glMultiTexCoordP4ui, glMultiTexCoordP4ui, NULL,
-                     625),
-    NAME_FUNC_OFFSET(10227, glMultiTexCoordP4uiv, glMultiTexCoordP4uiv, NULL,
-                     626),
-    NAME_FUNC_OFFSET(10248, glNormalP3ui, glNormalP3ui, NULL, 627),
-    NAME_FUNC_OFFSET(10261, glNormalP3uiv, glNormalP3uiv, NULL, 628),
-    NAME_FUNC_OFFSET(10275, glSecondaryColorP3ui, glSecondaryColorP3ui, NULL,
-                     629),
-    NAME_FUNC_OFFSET(10296, glSecondaryColorP3uiv, glSecondaryColorP3uiv, NULL,
-                     630),
-    NAME_FUNC_OFFSET(10318, glTexCoordP1ui, glTexCoordP1ui, NULL, 631),
-    NAME_FUNC_OFFSET(10333, glTexCoordP1uiv, glTexCoordP1uiv, NULL, 632),
-    NAME_FUNC_OFFSET(10349, glTexCoordP2ui, glTexCoordP2ui, NULL, 633),
-    NAME_FUNC_OFFSET(10364, glTexCoordP2uiv, glTexCoordP2uiv, NULL, 634),
-    NAME_FUNC_OFFSET(10380, glTexCoordP3ui, glTexCoordP3ui, NULL, 635),
-    NAME_FUNC_OFFSET(10395, glTexCoordP3uiv, glTexCoordP3uiv, NULL, 636),
-    NAME_FUNC_OFFSET(10411, glTexCoordP4ui, glTexCoordP4ui, NULL, 637),
-    NAME_FUNC_OFFSET(10426, glTexCoordP4uiv, glTexCoordP4uiv, NULL, 638),
-    NAME_FUNC_OFFSET(10442, glVertexAttribP1ui, glVertexAttribP1ui, NULL, 639),
-    NAME_FUNC_OFFSET(10461, glVertexAttribP1uiv, glVertexAttribP1uiv, NULL,
-                     640),
-    NAME_FUNC_OFFSET(10481, glVertexAttribP2ui, glVertexAttribP2ui, NULL, 641),
-    NAME_FUNC_OFFSET(10500, glVertexAttribP2uiv, glVertexAttribP2uiv, NULL,
-                     642),
-    NAME_FUNC_OFFSET(10520, glVertexAttribP3ui, glVertexAttribP3ui, NULL, 643),
-    NAME_FUNC_OFFSET(10539, glVertexAttribP3uiv, glVertexAttribP3uiv, NULL,
-                     644),
-    NAME_FUNC_OFFSET(10559, glVertexAttribP4ui, glVertexAttribP4ui, NULL, 645),
-    NAME_FUNC_OFFSET(10578, glVertexAttribP4uiv, glVertexAttribP4uiv, NULL,
-                     646),
-    NAME_FUNC_OFFSET(10598, glVertexP2ui, glVertexP2ui, NULL, 647),
-    NAME_FUNC_OFFSET(10611, glVertexP2uiv, glVertexP2uiv, NULL, 648),
-    NAME_FUNC_OFFSET(10625, glVertexP3ui, glVertexP3ui, NULL, 649),
-    NAME_FUNC_OFFSET(10638, glVertexP3uiv, glVertexP3uiv, NULL, 650),
-    NAME_FUNC_OFFSET(10652, glVertexP4ui, glVertexP4ui, NULL, 651),
-    NAME_FUNC_OFFSET(10665, glVertexP4uiv, glVertexP4uiv, NULL, 652),
-    NAME_FUNC_OFFSET(10679, glBindTransformFeedback, glBindTransformFeedback,
-                     NULL, 653),
-    NAME_FUNC_OFFSET(10703, glDeleteTransformFeedbacks,
-                     glDeleteTransformFeedbacks, NULL, 654),
-    NAME_FUNC_OFFSET(10730, glDrawTransformFeedback, glDrawTransformFeedback,
-                     NULL, 655),
-    NAME_FUNC_OFFSET(10754, glGenTransformFeedbacks, glGenTransformFeedbacks,
-                     NULL, 656),
-    NAME_FUNC_OFFSET(10778, glIsTransformFeedback, glIsTransformFeedback, NULL,
-                     657),
-    NAME_FUNC_OFFSET(10800, glPauseTransformFeedback, glPauseTransformFeedback,
-                     NULL, 658),
-    NAME_FUNC_OFFSET(10825, glResumeTransformFeedback,
-                     glResumeTransformFeedback, NULL, 659),
-    NAME_FUNC_OFFSET(10851, glClearDepthf, glClearDepthf, NULL, 660),
-    NAME_FUNC_OFFSET(10865, glDepthRangef, glDepthRangef, NULL, 661),
-    NAME_FUNC_OFFSET(10879, glGetShaderPrecisionFormat,
-                     glGetShaderPrecisionFormat, NULL, 662),
-    NAME_FUNC_OFFSET(10906, glReleaseShaderCompiler, glReleaseShaderCompiler,
-                     NULL, 663),
-    NAME_FUNC_OFFSET(10930, glShaderBinary, glShaderBinary, NULL, 664),
-    NAME_FUNC_OFFSET(10945, glGetGraphicsResetStatusARB,
-                     glGetGraphicsResetStatusARB, NULL, 665),
-    NAME_FUNC_OFFSET(10973, glGetnColorTableARB, glGetnColorTableARB, NULL,
-                     666),
-    NAME_FUNC_OFFSET(10993, glGetnCompressedTexImageARB,
-                     glGetnCompressedTexImageARB, NULL, 667),
-    NAME_FUNC_OFFSET(11021, glGetnConvolutionFilterARB,
-                     glGetnConvolutionFilterARB, NULL, 668),
-    NAME_FUNC_OFFSET(11048, glGetnHistogramARB, glGetnHistogramARB, NULL, 669),
-    NAME_FUNC_OFFSET(11067, glGetnMapdvARB, glGetnMapdvARB, NULL, 670),
-    NAME_FUNC_OFFSET(11082, glGetnMapfvARB, glGetnMapfvARB, NULL, 671),
-    NAME_FUNC_OFFSET(11097, glGetnMapivARB, glGetnMapivARB, NULL, 672),
-    NAME_FUNC_OFFSET(11112, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 673),
-    NAME_FUNC_OFFSET(11128, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL,
-                     674),
-    NAME_FUNC_OFFSET(11148, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL,
-                     675),
-    NAME_FUNC_OFFSET(11169, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL,
-                     676),
-    NAME_FUNC_OFFSET(11190, glGetnPolygonStippleARB, glGetnPolygonStippleARB,
-                     NULL, 677),
-    NAME_FUNC_OFFSET(11214, glGetnSeparableFilterARB, glGetnSeparableFilterARB,
-                     NULL, 678),
-    NAME_FUNC_OFFSET(11239, glGetnTexImageARB, glGetnTexImageARB, NULL, 679),
-    NAME_FUNC_OFFSET(11257, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 680),
-    NAME_FUNC_OFFSET(11276, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 681),
-    NAME_FUNC_OFFSET(11295, glGetnUniformivARB, glGetnUniformivARB, NULL, 682),
-    NAME_FUNC_OFFSET(11314, glGetnUniformuivARB, glGetnUniformuivARB, NULL,
-                     683),
-    NAME_FUNC_OFFSET(11334, glReadnPixelsARB, glReadnPixelsARB, NULL, 684),
-    NAME_FUNC_OFFSET(11351, glTexStorage1D, glTexStorage1D, NULL, 685),
-    NAME_FUNC_OFFSET(11366, glTexStorage2D, glTexStorage2D, NULL, 686),
-    NAME_FUNC_OFFSET(11381, glTexStorage3D, glTexStorage3D, NULL, 687),
-    NAME_FUNC_OFFSET(11396, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL,
-                     688),
-    NAME_FUNC_OFFSET(11418, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL,
-                     689),
-    NAME_FUNC_OFFSET(11440, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL,
-                     690),
-    NAME_FUNC_OFFSET(11462, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 691),
-    NAME_FUNC_OFFSET(11481, gl_dispatch_stub_692, gl_dispatch_stub_692, NULL,
-                     692),
-    NAME_FUNC_OFFSET(11513, gl_dispatch_stub_693, gl_dispatch_stub_693, NULL,
-                     693),
-    NAME_FUNC_OFFSET(11545, gl_dispatch_stub_694, gl_dispatch_stub_694, NULL,
-                     694),
-    NAME_FUNC_OFFSET(11573, gl_dispatch_stub_695, gl_dispatch_stub_695, NULL,
-                     695),
-    NAME_FUNC_OFFSET(11602, gl_dispatch_stub_696, gl_dispatch_stub_696, NULL,
-                     696),
-    NAME_FUNC_OFFSET(11630, gl_dispatch_stub_697, gl_dispatch_stub_697, NULL,
-                     697),
-    NAME_FUNC_OFFSET(11659, gl_dispatch_stub_698, gl_dispatch_stub_698, NULL,
-                     698),
-    NAME_FUNC_OFFSET(11676, gl_dispatch_stub_699, gl_dispatch_stub_699, NULL,
-                     699),
-    NAME_FUNC_OFFSET(11696, glColorPointerEXT, glColorPointerEXT, NULL, 700),
-    NAME_FUNC_OFFSET(11714, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL,
-                     701),
-    NAME_FUNC_OFFSET(11735, glIndexPointerEXT, glIndexPointerEXT, NULL, 702),
-    NAME_FUNC_OFFSET(11753, glNormalPointerEXT, glNormalPointerEXT, NULL, 703),
-    NAME_FUNC_OFFSET(11772, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL,
-                     704),
-    NAME_FUNC_OFFSET(11793, glVertexPointerEXT, glVertexPointerEXT, NULL, 705),
-    NAME_FUNC_OFFSET(11812, glPointParameterfEXT, glPointParameterfEXT, NULL,
-                     706),
-    NAME_FUNC_OFFSET(11833, glPointParameterfvEXT, glPointParameterfvEXT, NULL,
-                     707),
-    NAME_FUNC_OFFSET(11855, glLockArraysEXT, glLockArraysEXT, NULL, 708),
-    NAME_FUNC_OFFSET(11871, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 709),
-    NAME_FUNC_OFFSET(11889, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL,
-                     710),
-    NAME_FUNC_OFFSET(11911, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT,
-                     NULL, 711),
-    NAME_FUNC_OFFSET(11934, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL,
-                     712),
-    NAME_FUNC_OFFSET(11956, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT,
-                     NULL, 713),
-    NAME_FUNC_OFFSET(11979, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL,
-                     714),
-    NAME_FUNC_OFFSET(12001, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT,
-                     NULL, 715),
-    NAME_FUNC_OFFSET(12024, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL,
-                     716),
-    NAME_FUNC_OFFSET(12046, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT,
-                     NULL, 717),
-    NAME_FUNC_OFFSET(12069, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL,
-                     718),
-    NAME_FUNC_OFFSET(12091, glSecondaryColor3svEXT, glSecondaryColor3svEXT,
-                     NULL, 719),
-    NAME_FUNC_OFFSET(12114, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT,
-                     NULL, 720),
-    NAME_FUNC_OFFSET(12137, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT,
-                     NULL, 721),
-    NAME_FUNC_OFFSET(12161, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT,
-                     NULL, 722),
-    NAME_FUNC_OFFSET(12184, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT,
-                     NULL, 723),
-    NAME_FUNC_OFFSET(12208, glSecondaryColor3usEXT, glSecondaryColor3usEXT,
-                     NULL, 724),
-    NAME_FUNC_OFFSET(12231, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT,
-                     NULL, 725),
-    NAME_FUNC_OFFSET(12255, glSecondaryColorPointerEXT,
-                     glSecondaryColorPointerEXT, NULL, 726),
-    NAME_FUNC_OFFSET(12282, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL,
-                     727),
-    NAME_FUNC_OFFSET(12303, glMultiDrawElementsEXT, glMultiDrawElementsEXT,
-                     NULL, 728),
-    NAME_FUNC_OFFSET(12326, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL,
-                     729),
-    NAME_FUNC_OFFSET(12347, glFogCoorddEXT, glFogCoorddEXT, NULL, 730),
-    NAME_FUNC_OFFSET(12362, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 731),
-    NAME_FUNC_OFFSET(12378, glFogCoordfEXT, glFogCoordfEXT, NULL, 732),
-    NAME_FUNC_OFFSET(12393, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 733),
-    NAME_FUNC_OFFSET(12409, gl_dispatch_stub_734, gl_dispatch_stub_734, NULL,
-                     734),
-    NAME_FUNC_OFFSET(12427, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT,
-                     NULL, 735),
-    NAME_FUNC_OFFSET(12450, glFlushVertexArrayRangeNV,
-                     glFlushVertexArrayRangeNV, NULL, 736),
-    NAME_FUNC_OFFSET(12476, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL,
-                     737),
-    NAME_FUNC_OFFSET(12497, glCombinerInputNV, glCombinerInputNV, NULL, 738),
-    NAME_FUNC_OFFSET(12515, glCombinerOutputNV, glCombinerOutputNV, NULL, 739),
-    NAME_FUNC_OFFSET(12534, glCombinerParameterfNV, glCombinerParameterfNV,
-                     NULL, 740),
-    NAME_FUNC_OFFSET(12557, glCombinerParameterfvNV, glCombinerParameterfvNV,
-                     NULL, 741),
-    NAME_FUNC_OFFSET(12581, glCombinerParameteriNV, glCombinerParameteriNV,
-                     NULL, 742),
-    NAME_FUNC_OFFSET(12604, glCombinerParameterivNV, glCombinerParameterivNV,
-                     NULL, 743),
-    NAME_FUNC_OFFSET(12628, glFinalCombinerInputNV, glFinalCombinerInputNV,
-                     NULL, 744),
-    NAME_FUNC_OFFSET(12651, glGetCombinerInputParameterfvNV,
-                     glGetCombinerInputParameterfvNV, NULL, 745),
-    NAME_FUNC_OFFSET(12683, glGetCombinerInputParameterivNV,
-                     glGetCombinerInputParameterivNV, NULL, 746),
-    NAME_FUNC_OFFSET(12715, glGetCombinerOutputParameterfvNV,
-                     glGetCombinerOutputParameterfvNV, NULL, 747),
-    NAME_FUNC_OFFSET(12748, glGetCombinerOutputParameterivNV,
-                     glGetCombinerOutputParameterivNV, NULL, 748),
-    NAME_FUNC_OFFSET(12781, glGetFinalCombinerInputParameterfvNV,
-                     glGetFinalCombinerInputParameterfvNV, NULL, 749),
-    NAME_FUNC_OFFSET(12818, glGetFinalCombinerInputParameterivNV,
-                     glGetFinalCombinerInputParameterivNV, NULL, 750),
-    NAME_FUNC_OFFSET(12855, glResizeBuffersMESA, glResizeBuffersMESA, NULL,
-                     751),
-    NAME_FUNC_OFFSET(12875, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 752),
-    NAME_FUNC_OFFSET(12893, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 753),
-    NAME_FUNC_OFFSET(12912, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 754),
-    NAME_FUNC_OFFSET(12930, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 755),
-    NAME_FUNC_OFFSET(12949, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 756),
-    NAME_FUNC_OFFSET(12967, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 757),
-    NAME_FUNC_OFFSET(12986, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 758),
-    NAME_FUNC_OFFSET(13004, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 759),
-    NAME_FUNC_OFFSET(13023, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 760),
-    NAME_FUNC_OFFSET(13041, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(13060, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 762),
-    NAME_FUNC_OFFSET(13078, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 763),
-    NAME_FUNC_OFFSET(13097, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 764),
-    NAME_FUNC_OFFSET(13115, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 765),
-    NAME_FUNC_OFFSET(13134, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 766),
-    NAME_FUNC_OFFSET(13152, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 767),
-    NAME_FUNC_OFFSET(13171, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 768),
-    NAME_FUNC_OFFSET(13189, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 769),
-    NAME_FUNC_OFFSET(13208, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 770),
-    NAME_FUNC_OFFSET(13226, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 771),
-    NAME_FUNC_OFFSET(13245, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 772),
-    NAME_FUNC_OFFSET(13263, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 773),
-    NAME_FUNC_OFFSET(13282, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 774),
-    NAME_FUNC_OFFSET(13300, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 775),
-    NAME_FUNC_OFFSET(13319, gl_dispatch_stub_776, gl_dispatch_stub_776, NULL,
-                     776),
-    NAME_FUNC_OFFSET(13344, gl_dispatch_stub_777, gl_dispatch_stub_777, NULL,
-                     777),
-    NAME_FUNC_OFFSET(13371, gl_dispatch_stub_778, gl_dispatch_stub_778, NULL,
-                     778),
-    NAME_FUNC_OFFSET(13388, gl_dispatch_stub_779, gl_dispatch_stub_779, NULL,
-                     779),
-    NAME_FUNC_OFFSET(13404, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL,
-                     780),
-    NAME_FUNC_OFFSET(13418, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL,
-                     781),
-    NAME_FUNC_OFFSET(13433, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL,
-                     782),
-    NAME_FUNC_OFFSET(13445, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL,
-                     783),
-    NAME_FUNC_OFFSET(13458, gl_dispatch_stub_784, gl_dispatch_stub_784, NULL,
-                     784),
-    NAME_FUNC_OFFSET(13472, glAreProgramsResidentNV, glAreProgramsResidentNV,
-                     NULL, 785),
-    NAME_FUNC_OFFSET(13496, glBindProgramNV, glBindProgramNV, NULL, 786),
-    NAME_FUNC_OFFSET(13512, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 787),
-    NAME_FUNC_OFFSET(13531, glExecuteProgramNV, glExecuteProgramNV, NULL, 788),
-    NAME_FUNC_OFFSET(13550, glGenProgramsNV, glGenProgramsNV, NULL, 789),
-    NAME_FUNC_OFFSET(13566, glGetProgramParameterdvNV,
-                     glGetProgramParameterdvNV, NULL, 790),
-    NAME_FUNC_OFFSET(13592, glGetProgramParameterfvNV,
-                     glGetProgramParameterfvNV, NULL, 791),
-    NAME_FUNC_OFFSET(13618, glGetProgramStringNV, glGetProgramStringNV, NULL,
-                     792),
-    NAME_FUNC_OFFSET(13639, glGetProgramivNV, glGetProgramivNV, NULL, 793),
-    NAME_FUNC_OFFSET(13656, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL,
-                     794),
-    NAME_FUNC_OFFSET(13677, glGetVertexAttribPointervNV,
-                     glGetVertexAttribPointervNV, NULL, 795),
-    NAME_FUNC_OFFSET(13705, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL,
-                     796),
-    NAME_FUNC_OFFSET(13727, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL,
-                     797),
-    NAME_FUNC_OFFSET(13749, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL,
-                     798),
-    NAME_FUNC_OFFSET(13771, glIsProgramNV, glIsProgramNV, NULL, 799),
-    NAME_FUNC_OFFSET(13785, glLoadProgramNV, glLoadProgramNV, NULL, 800),
-    NAME_FUNC_OFFSET(13801, glProgramParameters4dvNV, glProgramParameters4dvNV,
-                     NULL, 801),
-    NAME_FUNC_OFFSET(13826, glProgramParameters4fvNV, glProgramParameters4fvNV,
-                     NULL, 802),
-    NAME_FUNC_OFFSET(13851, glRequestResidentProgramsNV,
-                     glRequestResidentProgramsNV, NULL, 803),
-    NAME_FUNC_OFFSET(13879, glTrackMatrixNV, glTrackMatrixNV, NULL, 804),
-    NAME_FUNC_OFFSET(13895, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 805),
-    NAME_FUNC_OFFSET(13914, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL,
-                     806),
-    NAME_FUNC_OFFSET(13934, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 807),
-    NAME_FUNC_OFFSET(13953, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL,
-                     808),
-    NAME_FUNC_OFFSET(13973, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 809),
-    NAME_FUNC_OFFSET(13992, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL,
-                     810),
-    NAME_FUNC_OFFSET(14012, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 811),
-    NAME_FUNC_OFFSET(14031, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL,
-                     812),
-    NAME_FUNC_OFFSET(14051, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 813),
-    NAME_FUNC_OFFSET(14070, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL,
-                     814),
-    NAME_FUNC_OFFSET(14090, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 815),
-    NAME_FUNC_OFFSET(14109, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL,
-                     816),
-    NAME_FUNC_OFFSET(14129, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 817),
-    NAME_FUNC_OFFSET(14148, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL,
-                     818),
-    NAME_FUNC_OFFSET(14168, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 819),
-    NAME_FUNC_OFFSET(14187, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL,
-                     820),
-    NAME_FUNC_OFFSET(14207, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 821),
-    NAME_FUNC_OFFSET(14226, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL,
-                     822),
-    NAME_FUNC_OFFSET(14246, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 823),
-    NAME_FUNC_OFFSET(14265, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL,
-                     824),
-    NAME_FUNC_OFFSET(14285, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 825),
-    NAME_FUNC_OFFSET(14304, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL,
-                     826),
-    NAME_FUNC_OFFSET(14324, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 827),
-    NAME_FUNC_OFFSET(14343, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL,
-                     828),
-    NAME_FUNC_OFFSET(14363, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL,
-                     829),
-    NAME_FUNC_OFFSET(14383, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL,
-                     830),
-    NAME_FUNC_OFFSET(14404, glVertexAttribPointerNV, glVertexAttribPointerNV,
-                     NULL, 831),
-    NAME_FUNC_OFFSET(14428, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL,
-                     832),
-    NAME_FUNC_OFFSET(14449, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL,
-                     833),
-    NAME_FUNC_OFFSET(14470, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL,
-                     834),
-    NAME_FUNC_OFFSET(14491, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL,
-                     835),
-    NAME_FUNC_OFFSET(14512, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL,
-                     836),
-    NAME_FUNC_OFFSET(14533, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL,
-                     837),
-    NAME_FUNC_OFFSET(14554, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL,
-                     838),
-    NAME_FUNC_OFFSET(14575, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL,
-                     839),
-    NAME_FUNC_OFFSET(14596, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL,
-                     840),
-    NAME_FUNC_OFFSET(14617, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL,
-                     841),
-    NAME_FUNC_OFFSET(14638, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL,
-                     842),
-    NAME_FUNC_OFFSET(14659, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL,
-                     843),
-    NAME_FUNC_OFFSET(14680, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL,
-                     844),
-    NAME_FUNC_OFFSET(14702, glGetTexBumpParameterfvATI,
-                     glGetTexBumpParameterfvATI, NULL, 845),
-    NAME_FUNC_OFFSET(14729, glGetTexBumpParameterivATI,
-                     glGetTexBumpParameterivATI, NULL, 846),
-    NAME_FUNC_OFFSET(14756, glTexBumpParameterfvATI, glTexBumpParameterfvATI,
-                     NULL, 847),
-    NAME_FUNC_OFFSET(14780, glTexBumpParameterivATI, glTexBumpParameterivATI,
-                     NULL, 848),
-    NAME_FUNC_OFFSET(14804, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL,
-                     849),
-    NAME_FUNC_OFFSET(14826, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL,
-                     850),
-    NAME_FUNC_OFFSET(14848, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL,
-                     851),
-    NAME_FUNC_OFFSET(14870, glBeginFragmentShaderATI, glBeginFragmentShaderATI,
-                     NULL, 852),
-    NAME_FUNC_OFFSET(14895, glBindFragmentShaderATI, glBindFragmentShaderATI,
-                     NULL, 853),
-    NAME_FUNC_OFFSET(14919, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL,
-                     854),
-    NAME_FUNC_OFFSET(14941, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL,
-                     855),
-    NAME_FUNC_OFFSET(14963, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL,
-                     856),
-    NAME_FUNC_OFFSET(14985, glDeleteFragmentShaderATI,
-                     glDeleteFragmentShaderATI, NULL, 857),
-    NAME_FUNC_OFFSET(15011, glEndFragmentShaderATI, glEndFragmentShaderATI,
-                     NULL, 858),
-    NAME_FUNC_OFFSET(15034, glGenFragmentShadersATI, glGenFragmentShadersATI,
-                     NULL, 859),
-    NAME_FUNC_OFFSET(15058, glPassTexCoordATI, glPassTexCoordATI, NULL, 860),
-    NAME_FUNC_OFFSET(15076, glSampleMapATI, glSampleMapATI, NULL, 861),
-    NAME_FUNC_OFFSET(15091, glSetFragmentShaderConstantATI,
-                     glSetFragmentShaderConstantATI, NULL, 862),
-    NAME_FUNC_OFFSET(15122, glPointParameteriNV, glPointParameteriNV, NULL,
-                     863),
-    NAME_FUNC_OFFSET(15142, glPointParameterivNV, glPointParameterivNV, NULL,
-                     864),
-    NAME_FUNC_OFFSET(15163, gl_dispatch_stub_865, gl_dispatch_stub_865, NULL,
-                     865),
-    NAME_FUNC_OFFSET(15186, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL,
-                     866),
-    NAME_FUNC_OFFSET(15209, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL,
-                     867),
-    NAME_FUNC_OFFSET(15235, gl_dispatch_stub_868, gl_dispatch_stub_868, NULL,
-                     868),
-    NAME_FUNC_OFFSET(15258, gl_dispatch_stub_869, gl_dispatch_stub_869, NULL,
-                     869),
-    NAME_FUNC_OFFSET(15279, glGetProgramNamedParameterdvNV,
-                     glGetProgramNamedParameterdvNV, NULL, 870),
-    NAME_FUNC_OFFSET(15310, glGetProgramNamedParameterfvNV,
-                     glGetProgramNamedParameterfvNV, NULL, 871),
-    NAME_FUNC_OFFSET(15341, glProgramNamedParameter4dNV,
-                     glProgramNamedParameter4dNV, NULL, 872),
-    NAME_FUNC_OFFSET(15369, glProgramNamedParameter4dvNV,
-                     glProgramNamedParameter4dvNV, NULL, 873),
-    NAME_FUNC_OFFSET(15398, glProgramNamedParameter4fNV,
-                     glProgramNamedParameter4fNV, NULL, 874),
-    NAME_FUNC_OFFSET(15426, glProgramNamedParameter4fvNV,
-                     glProgramNamedParameter4fvNV, NULL, 875),
-    NAME_FUNC_OFFSET(15455, glPrimitiveRestartIndexNV,
-                     glPrimitiveRestartIndexNV, NULL, 876),
-    NAME_FUNC_OFFSET(15481, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL,
-                     877),
-    NAME_FUNC_OFFSET(15502, gl_dispatch_stub_878, gl_dispatch_stub_878, NULL,
-                     878),
-    NAME_FUNC_OFFSET(15519, gl_dispatch_stub_879, gl_dispatch_stub_879, NULL,
-                     879),
-    NAME_FUNC_OFFSET(15546, glBindFramebufferEXT, glBindFramebufferEXT, NULL,
-                     880),
-    NAME_FUNC_OFFSET(15567, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL,
-                     881),
-    NAME_FUNC_OFFSET(15589, glCheckFramebufferStatusEXT,
-                     glCheckFramebufferStatusEXT, NULL, 882),
-    NAME_FUNC_OFFSET(15617, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT,
-                     NULL, 883),
-    NAME_FUNC_OFFSET(15641, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT,
-                     NULL, 884),
-    NAME_FUNC_OFFSET(15666, glFramebufferRenderbufferEXT,
-                     glFramebufferRenderbufferEXT, NULL, 885),
-    NAME_FUNC_OFFSET(15695, glFramebufferTexture1DEXT,
-                     glFramebufferTexture1DEXT, NULL, 886),
-    NAME_FUNC_OFFSET(15721, glFramebufferTexture2DEXT,
-                     glFramebufferTexture2DEXT, NULL, 887),
-    NAME_FUNC_OFFSET(15747, glFramebufferTexture3DEXT,
-                     glFramebufferTexture3DEXT, NULL, 888),
-    NAME_FUNC_OFFSET(15773, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL,
-                     889),
-    NAME_FUNC_OFFSET(15794, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL,
-                     890),
-    NAME_FUNC_OFFSET(15816, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL,
-                     891),
-    NAME_FUNC_OFFSET(15836, glGetFramebufferAttachmentParameterivEXT,
-                     glGetFramebufferAttachmentParameterivEXT, NULL, 892),
-    NAME_FUNC_OFFSET(15877, glGetRenderbufferParameterivEXT,
-                     glGetRenderbufferParameterivEXT, NULL, 893),
-    NAME_FUNC_OFFSET(15909, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 894),
-    NAME_FUNC_OFFSET(15928, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL,
-                     895),
-    NAME_FUNC_OFFSET(15948, glRenderbufferStorageEXT, glRenderbufferStorageEXT,
-                     NULL, 896),
-    NAME_FUNC_OFFSET(15973, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL,
-                     897),
-    NAME_FUNC_OFFSET(15994, gl_dispatch_stub_898, gl_dispatch_stub_898, NULL,
-                     898),
-    NAME_FUNC_OFFSET(16018, gl_dispatch_stub_899, gl_dispatch_stub_899, NULL,
-                     899),
-    NAME_FUNC_OFFSET(16048, glBindFragDataLocationEXT,
-                     glBindFragDataLocationEXT, NULL, 900),
-    NAME_FUNC_OFFSET(16074, glGetFragDataLocationEXT, glGetFragDataLocationEXT,
-                     NULL, 901),
-    NAME_FUNC_OFFSET(16099, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 902),
-    NAME_FUNC_OFFSET(16118, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT,
-                     NULL, 903),
-    NAME_FUNC_OFFSET(16142, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT,
-                     NULL, 904),
-    NAME_FUNC_OFFSET(16167, glUniform1uiEXT, glUniform1uiEXT, NULL, 905),
-    NAME_FUNC_OFFSET(16183, glUniform1uivEXT, glUniform1uivEXT, NULL, 906),
-    NAME_FUNC_OFFSET(16200, glUniform2uiEXT, glUniform2uiEXT, NULL, 907),
-    NAME_FUNC_OFFSET(16216, glUniform2uivEXT, glUniform2uivEXT, NULL, 908),
-    NAME_FUNC_OFFSET(16233, glUniform3uiEXT, glUniform3uiEXT, NULL, 909),
-    NAME_FUNC_OFFSET(16249, glUniform3uivEXT, glUniform3uivEXT, NULL, 910),
-    NAME_FUNC_OFFSET(16266, glUniform4uiEXT, glUniform4uiEXT, NULL, 911),
-    NAME_FUNC_OFFSET(16282, glUniform4uivEXT, glUniform4uivEXT, NULL, 912),
-    NAME_FUNC_OFFSET(16299, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL,
-                     913),
-    NAME_FUNC_OFFSET(16320, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL,
-                     914),
-    NAME_FUNC_OFFSET(16342, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL,
-                     915),
-    NAME_FUNC_OFFSET(16364, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT,
-                     NULL, 916),
-    NAME_FUNC_OFFSET(16387, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL,
-                     917),
-    NAME_FUNC_OFFSET(16408, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL,
-                     918),
-    NAME_FUNC_OFFSET(16430, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL,
-                     919),
-    NAME_FUNC_OFFSET(16452, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT,
-                     NULL, 920),
-    NAME_FUNC_OFFSET(16475, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL,
-                     921),
-    NAME_FUNC_OFFSET(16496, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL,
-                     922),
-    NAME_FUNC_OFFSET(16518, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL,
-                     923),
-    NAME_FUNC_OFFSET(16540, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT,
-                     NULL, 924),
-    NAME_FUNC_OFFSET(16563, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL,
-                     925),
-    NAME_FUNC_OFFSET(16585, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL,
-                     926),
-    NAME_FUNC_OFFSET(16606, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL,
-                     927),
-    NAME_FUNC_OFFSET(16628, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL,
-                     928),
-    NAME_FUNC_OFFSET(16650, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT,
-                     NULL, 929),
-    NAME_FUNC_OFFSET(16673, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL,
-                     930),
-    NAME_FUNC_OFFSET(16695, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT,
-                     NULL, 931),
-    NAME_FUNC_OFFSET(16718, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT,
-                     NULL, 932),
-    NAME_FUNC_OFFSET(16741, glVertexAttribIPointerEXT,
-                     glVertexAttribIPointerEXT, NULL, 933),
-    NAME_FUNC_OFFSET(16767, glFramebufferTextureLayerEXT,
-                     glFramebufferTextureLayerEXT, NULL, 934),
-    NAME_FUNC_OFFSET(16796, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL,
-                     935),
-    NAME_FUNC_OFFSET(16818, glDisableIndexedEXT, glDisableIndexedEXT, NULL,
-                     936),
-    NAME_FUNC_OFFSET(16838, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 937),
-    NAME_FUNC_OFFSET(16857, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT,
-                     NULL, 938),
-    NAME_FUNC_OFFSET(16881, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT,
-                     NULL, 939),
-    NAME_FUNC_OFFSET(16905, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL,
-                     940),
-    NAME_FUNC_OFFSET(16927, glClearColorIiEXT, glClearColorIiEXT, NULL, 941),
-    NAME_FUNC_OFFSET(16945, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 942),
-    NAME_FUNC_OFFSET(16964, glGetTexParameterIivEXT, glGetTexParameterIivEXT,
-                     NULL, 943),
-    NAME_FUNC_OFFSET(16988, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT,
-                     NULL, 944),
-    NAME_FUNC_OFFSET(17013, glTexParameterIivEXT, glTexParameterIivEXT, NULL,
-                     945),
-    NAME_FUNC_OFFSET(17034, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL,
-                     946),
-    NAME_FUNC_OFFSET(17056, glBeginConditionalRenderNV,
-                     glBeginConditionalRenderNV, NULL, 947),
-    NAME_FUNC_OFFSET(17083, glEndConditionalRenderNV, glEndConditionalRenderNV,
-                     NULL, 948),
-    NAME_FUNC_OFFSET(17108, glBeginTransformFeedbackEXT,
-                     glBeginTransformFeedbackEXT, NULL, 949),
-    NAME_FUNC_OFFSET(17136, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL,
-                     950),
-    NAME_FUNC_OFFSET(17156, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL,
-                     951),
-    NAME_FUNC_OFFSET(17178, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL,
-                     952),
-    NAME_FUNC_OFFSET(17199, glEndTransformFeedbackEXT,
-                     glEndTransformFeedbackEXT, NULL, 953),
-    NAME_FUNC_OFFSET(17225, glGetTransformFeedbackVaryingEXT,
-                     glGetTransformFeedbackVaryingEXT, NULL, 954),
-    NAME_FUNC_OFFSET(17258, glTransformFeedbackVaryingsEXT,
-                     glTransformFeedbackVaryingsEXT, NULL, 955),
-    NAME_FUNC_OFFSET(17289, glProvokingVertexEXT, glProvokingVertexEXT, NULL,
-                     956),
-    NAME_FUNC_OFFSET(17310, gl_dispatch_stub_957, gl_dispatch_stub_957, NULL,
-                     957),
-    NAME_FUNC_OFFSET(17341, gl_dispatch_stub_958, gl_dispatch_stub_958, NULL,
-                     958),
-    NAME_FUNC_OFFSET(17361, glGetObjectParameterivAPPLE,
-                     glGetObjectParameterivAPPLE, NULL, 959),
-    NAME_FUNC_OFFSET(17389, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE,
-                     NULL, 960),
-    NAME_FUNC_OFFSET(17412, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE,
-                     NULL, 961),
-    NAME_FUNC_OFFSET(17437, glActiveProgramEXT, glActiveProgramEXT, NULL, 962),
-    NAME_FUNC_OFFSET(17456, glCreateShaderProgramEXT, glCreateShaderProgramEXT,
-                     NULL, 963),
-    NAME_FUNC_OFFSET(17481, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL,
-                     964),
-    NAME_FUNC_OFFSET(17503, glTextureBarrierNV, glTextureBarrierNV, NULL, 965),
-    NAME_FUNC_OFFSET(17522, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL,
-                     966),
-    NAME_FUNC_OFFSET(17547, gl_dispatch_stub_967, gl_dispatch_stub_967, NULL,
-                     967),
-    NAME_FUNC_OFFSET(17576, gl_dispatch_stub_968, gl_dispatch_stub_968, NULL,
-                     968),
-    NAME_FUNC_OFFSET(17607, gl_dispatch_stub_969, gl_dispatch_stub_969, NULL,
-                     969),
-    NAME_FUNC_OFFSET(17631, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL,
-                     970),
-    NAME_FUNC_OFFSET(17656, glEGLImageTargetRenderbufferStorageOES,
-                     glEGLImageTargetRenderbufferStorageOES, NULL, 971),
-    NAME_FUNC_OFFSET(17695, glEGLImageTargetTexture2DOES,
-                     glEGLImageTargetTexture2DOES, NULL, 972),
-    NAME_FUNC_OFFSET(17724, glArrayElement, glArrayElement, NULL, 306),
-    NAME_FUNC_OFFSET(17742, glBindTexture, glBindTexture, NULL, 307),
-    NAME_FUNC_OFFSET(17759, glDrawArrays, glDrawArrays, NULL, 310),
-    NAME_FUNC_OFFSET(17775, glAreTexturesResident, glAreTexturesResidentEXT,
-                     glAreTexturesResidentEXT, 322),
-    NAME_FUNC_OFFSET(17800, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
-    NAME_FUNC_OFFSET(17820, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
-    NAME_FUNC_OFFSET(17840, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL,
-                     325),
-    NAME_FUNC_OFFSET(17863, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL,
-                     326),
-    NAME_FUNC_OFFSET(17886, glDeleteTextures, glDeleteTexturesEXT,
-                     glDeleteTexturesEXT, 327),
-    NAME_FUNC_OFFSET(17906, glGenTextures, glGenTexturesEXT, glGenTexturesEXT,
-                     328),
-    NAME_FUNC_OFFSET(17923, glGetPointerv, glGetPointerv, NULL, 329),
-    NAME_FUNC_OFFSET(17940, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
-    NAME_FUNC_OFFSET(17955, glPrioritizeTextures, glPrioritizeTextures, NULL,
-                     331),
-    NAME_FUNC_OFFSET(17979, glTexSubImage1D, glTexSubImage1D, NULL, 332),
-    NAME_FUNC_OFFSET(17998, glTexSubImage2D, glTexSubImage2D, NULL, 333),
-    NAME_FUNC_OFFSET(18017, glBlendColor, glBlendColor, NULL, 336),
-    NAME_FUNC_OFFSET(18033, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(18052, glDrawRangeElements, glDrawRangeElements, NULL,
-                     338),
-    NAME_FUNC_OFFSET(18075, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(18091, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(18107, glColorTableParameterfv, glColorTableParameterfv,
-                     NULL, 340),
-    NAME_FUNC_OFFSET(18134, glColorTableParameteriv, glColorTableParameteriv,
-                     NULL, 341),
-    NAME_FUNC_OFFSET(18161, glCopyColorTable, glCopyColorTable, NULL, 342),
-    NAME_FUNC_OFFSET(18181, glGetColorTable, glGetColorTableEXT,
-                     glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(18200, glGetColorTable, glGetColorTableEXT,
-                     glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(18219, glGetColorTableParameterfv,
-                     glGetColorTableParameterfvEXT,
-                     glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(18249, glGetColorTableParameterfv,
-                     glGetColorTableParameterfvEXT,
-                     glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(18279, glGetColorTableParameteriv,
-                     glGetColorTableParameterivEXT,
-                     glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(18309, glGetColorTableParameteriv,
-                     glGetColorTableParameterivEXT,
-                     glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(18339, glColorSubTable, glColorSubTable, NULL, 346),
-    NAME_FUNC_OFFSET(18358, glCopyColorSubTable, glCopyColorSubTable, NULL,
-                     347),
-    NAME_FUNC_OFFSET(18381, glConvolutionFilter1D, glConvolutionFilter1D, NULL,
-                     348),
-    NAME_FUNC_OFFSET(18406, glConvolutionFilter2D, glConvolutionFilter2D, NULL,
-                     349),
-    NAME_FUNC_OFFSET(18431, glConvolutionParameterf, glConvolutionParameterf,
-                     NULL, 350),
-    NAME_FUNC_OFFSET(18458, glConvolutionParameterfv, glConvolutionParameterfv,
-                     NULL, 351),
-    NAME_FUNC_OFFSET(18486, glConvolutionParameteri, glConvolutionParameteri,
-                     NULL, 352),
-    NAME_FUNC_OFFSET(18513, glConvolutionParameteriv, glConvolutionParameteriv,
-                     NULL, 353),
-    NAME_FUNC_OFFSET(18541, glCopyConvolutionFilter1D,
-                     glCopyConvolutionFilter1D, NULL, 354),
-    NAME_FUNC_OFFSET(18570, glCopyConvolutionFilter2D,
-                     glCopyConvolutionFilter2D, NULL, 355),
-    NAME_FUNC_OFFSET(18599, glGetConvolutionFilter, gl_dispatch_stub_356,
-                     gl_dispatch_stub_356, 356),
-    NAME_FUNC_OFFSET(18625, glGetConvolutionParameterfv, gl_dispatch_stub_357,
-                     gl_dispatch_stub_357, 357),
-    NAME_FUNC_OFFSET(18656, glGetConvolutionParameteriv, gl_dispatch_stub_358,
-                     gl_dispatch_stub_358, 358),
-    NAME_FUNC_OFFSET(18687, glGetSeparableFilter, gl_dispatch_stub_359,
-                     gl_dispatch_stub_359, 359),
-    NAME_FUNC_OFFSET(18711, glSeparableFilter2D, glSeparableFilter2D, NULL,
-                     360),
-    NAME_FUNC_OFFSET(18734, glGetHistogram, gl_dispatch_stub_361,
-                     gl_dispatch_stub_361, 361),
-    NAME_FUNC_OFFSET(18752, glGetHistogramParameterfv, gl_dispatch_stub_362,
-                     gl_dispatch_stub_362, 362),
-    NAME_FUNC_OFFSET(18781, glGetHistogramParameteriv, gl_dispatch_stub_363,
-                     gl_dispatch_stub_363, 363),
-    NAME_FUNC_OFFSET(18810, glGetMinmax, gl_dispatch_stub_364,
-                     gl_dispatch_stub_364, 364),
-    NAME_FUNC_OFFSET(18825, glGetMinmaxParameterfv, gl_dispatch_stub_365,
-                     gl_dispatch_stub_365, 365),
-    NAME_FUNC_OFFSET(18851, glGetMinmaxParameteriv, gl_dispatch_stub_366,
-                     gl_dispatch_stub_366, 366),
-    NAME_FUNC_OFFSET(18877, glHistogram, glHistogram, NULL, 367),
-    NAME_FUNC_OFFSET(18892, glMinmax, glMinmax, NULL, 368),
-    NAME_FUNC_OFFSET(18904, glResetHistogram, glResetHistogram, NULL, 369),
-    NAME_FUNC_OFFSET(18924, glResetMinmax, glResetMinmax, NULL, 370),
-    NAME_FUNC_OFFSET(18941, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(18957, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(18976, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL,
-                     373),
-    NAME_FUNC_OFFSET(18999, glActiveTextureARB, glActiveTextureARB, NULL, 374),
-    NAME_FUNC_OFFSET(19015, glClientActiveTextureARB, glClientActiveTextureARB,
-                     NULL, 375),
-    NAME_FUNC_OFFSET(19037, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL,
-                     376),
-    NAME_FUNC_OFFSET(19055, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL,
-                     377),
-    NAME_FUNC_OFFSET(19074, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL,
-                     378),
-    NAME_FUNC_OFFSET(19092, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL,
-                     379),
-    NAME_FUNC_OFFSET(19111, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL,
-                     380),
-    NAME_FUNC_OFFSET(19129, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL,
-                     381),
-    NAME_FUNC_OFFSET(19148, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL,
-                     382),
-    NAME_FUNC_OFFSET(19166, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL,
-                     383),
-    NAME_FUNC_OFFSET(19185, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL,
-                     384),
-    NAME_FUNC_OFFSET(19203, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL,
-                     385),
-    NAME_FUNC_OFFSET(19222, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL,
-                     386),
-    NAME_FUNC_OFFSET(19240, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL,
-                     387),
-    NAME_FUNC_OFFSET(19259, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL,
-                     388),
-    NAME_FUNC_OFFSET(19277, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL,
-                     389),
-    NAME_FUNC_OFFSET(19296, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL,
-                     390),
-    NAME_FUNC_OFFSET(19314, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL,
-                     391),
-    NAME_FUNC_OFFSET(19333, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL,
-                     392),
-    NAME_FUNC_OFFSET(19351, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL,
-                     393),
-    NAME_FUNC_OFFSET(19370, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL,
-                     394),
-    NAME_FUNC_OFFSET(19388, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL,
-                     395),
-    NAME_FUNC_OFFSET(19407, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL,
-                     396),
-    NAME_FUNC_OFFSET(19425, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL,
-                     397),
-    NAME_FUNC_OFFSET(19444, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL,
-                     398),
-    NAME_FUNC_OFFSET(19462, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL,
-                     399),
-    NAME_FUNC_OFFSET(19481, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL,
-                     400),
-    NAME_FUNC_OFFSET(19499, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL,
-                     401),
-    NAME_FUNC_OFFSET(19518, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL,
-                     402),
-    NAME_FUNC_OFFSET(19536, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL,
-                     403),
-    NAME_FUNC_OFFSET(19555, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL,
-                     404),
-    NAME_FUNC_OFFSET(19573, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL,
-                     405),
-    NAME_FUNC_OFFSET(19592, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL,
-                     406),
-    NAME_FUNC_OFFSET(19610, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL,
-                     407),
-    NAME_FUNC_OFFSET(19629, glStencilOpSeparate, glStencilOpSeparate, NULL,
-                     423),
-    NAME_FUNC_OFFSET(19652, glLoadTransposeMatrixdARB,
-                     glLoadTransposeMatrixdARB, NULL, 441),
-    NAME_FUNC_OFFSET(19675, glLoadTransposeMatrixfARB,
-                     glLoadTransposeMatrixfARB, NULL, 442),
-    NAME_FUNC_OFFSET(19698, glMultTransposeMatrixdARB,
-                     glMultTransposeMatrixdARB, NULL, 443),
-    NAME_FUNC_OFFSET(19721, glMultTransposeMatrixfARB,
-                     glMultTransposeMatrixfARB, NULL, 444),
-    NAME_FUNC_OFFSET(19744, glSampleCoverageARB, glSampleCoverageARB, NULL,
-                     445),
-    NAME_FUNC_OFFSET(19761, glCompressedTexImage1DARB,
-                     glCompressedTexImage1DARB, NULL, 446),
-    NAME_FUNC_OFFSET(19784, glCompressedTexImage2DARB,
-                     glCompressedTexImage2DARB, NULL, 447),
-    NAME_FUNC_OFFSET(19807, glCompressedTexImage3DARB,
-                     glCompressedTexImage3DARB, NULL, 448),
-    NAME_FUNC_OFFSET(19830, glCompressedTexSubImage1DARB,
-                     glCompressedTexSubImage1DARB, NULL, 449),
-    NAME_FUNC_OFFSET(19856, glCompressedTexSubImage2DARB,
-                     glCompressedTexSubImage2DARB, NULL, 450),
-    NAME_FUNC_OFFSET(19882, glCompressedTexSubImage3DARB,
-                     glCompressedTexSubImage3DARB, NULL, 451),
-    NAME_FUNC_OFFSET(19908, glGetCompressedTexImageARB,
-                     glGetCompressedTexImageARB, NULL, 452),
-    NAME_FUNC_OFFSET(19932, glDisableVertexAttribArrayARB,
-                     glDisableVertexAttribArrayARB, NULL, 453),
-    NAME_FUNC_OFFSET(19959, glEnableVertexAttribArrayARB,
-                     glEnableVertexAttribArrayARB, NULL, 454),
-    NAME_FUNC_OFFSET(19985, glGetVertexAttribdvARB, glGetVertexAttribdvARB,
-                     NULL, 461),
-    NAME_FUNC_OFFSET(20005, glGetVertexAttribfvARB, glGetVertexAttribfvARB,
-                     NULL, 462),
-    NAME_FUNC_OFFSET(20025, glGetVertexAttribivARB, glGetVertexAttribivARB,
-                     NULL, 463),
-    NAME_FUNC_OFFSET(20045, glProgramEnvParameter4dARB,
-                     glProgramEnvParameter4dARB, NULL, 464),
-    NAME_FUNC_OFFSET(20068, glProgramEnvParameter4dvARB,
-                     glProgramEnvParameter4dvARB, NULL, 465),
-    NAME_FUNC_OFFSET(20092, glProgramEnvParameter4fARB,
-                     glProgramEnvParameter4fARB, NULL, 466),
-    NAME_FUNC_OFFSET(20115, glProgramEnvParameter4fvARB,
-                     glProgramEnvParameter4fvARB, NULL, 467),
-    NAME_FUNC_OFFSET(20139, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL,
-                     473),
-    NAME_FUNC_OFFSET(20156, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL,
-                     474),
-    NAME_FUNC_OFFSET(20174, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL,
-                     475),
-    NAME_FUNC_OFFSET(20191, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL,
-                     476),
-    NAME_FUNC_OFFSET(20209, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL,
-                     477),
-    NAME_FUNC_OFFSET(20226, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL,
-                     478),
-    NAME_FUNC_OFFSET(20244, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL,
-                     479),
-    NAME_FUNC_OFFSET(20261, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL,
-                     480),
-    NAME_FUNC_OFFSET(20279, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL,
-                     481),
-    NAME_FUNC_OFFSET(20296, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL,
-                     482),
-    NAME_FUNC_OFFSET(20314, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL,
-                     483),
-    NAME_FUNC_OFFSET(20331, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL,
-                     484),
-    NAME_FUNC_OFFSET(20349, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL,
-                     485),
-    NAME_FUNC_OFFSET(20366, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL,
-                     486),
-    NAME_FUNC_OFFSET(20384, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL,
-                     487),
-    NAME_FUNC_OFFSET(20401, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL,
-                     488),
-    NAME_FUNC_OFFSET(20419, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL,
-                     489),
-    NAME_FUNC_OFFSET(20436, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL,
-                     490),
-    NAME_FUNC_OFFSET(20454, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL,
-                     491),
-    NAME_FUNC_OFFSET(20473, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL,
-                     492),
-    NAME_FUNC_OFFSET(20492, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL,
-                     493),
-    NAME_FUNC_OFFSET(20511, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL,
-                     494),
-    NAME_FUNC_OFFSET(20530, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB,
-                     NULL, 495),
-    NAME_FUNC_OFFSET(20550, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB,
-                     NULL, 496),
-    NAME_FUNC_OFFSET(20570, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB,
-                     NULL, 497),
-    NAME_FUNC_OFFSET(20590, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL,
-                     498),
-    NAME_FUNC_OFFSET(20608, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL,
-                     499),
-    NAME_FUNC_OFFSET(20625, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL,
-                     500),
-    NAME_FUNC_OFFSET(20643, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL,
-                     501),
-    NAME_FUNC_OFFSET(20660, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL,
-                     502),
-    NAME_FUNC_OFFSET(20678, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL,
-                     503),
-    NAME_FUNC_OFFSET(20696, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL,
-                     504),
-    NAME_FUNC_OFFSET(20713, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL,
-                     505),
-    NAME_FUNC_OFFSET(20731, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL,
-                     506),
-    NAME_FUNC_OFFSET(20750, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL,
-                     507),
-    NAME_FUNC_OFFSET(20769, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL,
-                     508),
-    NAME_FUNC_OFFSET(20788, glVertexAttribPointerARB, glVertexAttribPointerARB,
-                     NULL, 509),
-    NAME_FUNC_OFFSET(20810, glBindBufferARB, glBindBufferARB, NULL, 510),
-    NAME_FUNC_OFFSET(20823, glBufferDataARB, glBufferDataARB, NULL, 511),
-    NAME_FUNC_OFFSET(20836, glBufferSubDataARB, glBufferSubDataARB, NULL, 512),
-    NAME_FUNC_OFFSET(20852, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 513),
-    NAME_FUNC_OFFSET(20868, glGenBuffersARB, glGenBuffersARB, NULL, 514),
-    NAME_FUNC_OFFSET(20881, glGetBufferParameterivARB,
-                     glGetBufferParameterivARB, NULL, 515),
-    NAME_FUNC_OFFSET(20904, glGetBufferPointervARB, glGetBufferPointervARB,
-                     NULL, 516),
-    NAME_FUNC_OFFSET(20924, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL,
-                     517),
-    NAME_FUNC_OFFSET(20943, glIsBufferARB, glIsBufferARB, NULL, 518),
-    NAME_FUNC_OFFSET(20954, glMapBufferARB, glMapBufferARB, NULL, 519),
-    NAME_FUNC_OFFSET(20966, glUnmapBufferARB, glUnmapBufferARB, NULL, 520),
-    NAME_FUNC_OFFSET(20980, glBeginQueryARB, glBeginQueryARB, NULL, 521),
-    NAME_FUNC_OFFSET(20993, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 522),
-    NAME_FUNC_OFFSET(21009, glEndQueryARB, glEndQueryARB, NULL, 523),
-    NAME_FUNC_OFFSET(21020, glGenQueriesARB, glGenQueriesARB, NULL, 524),
-    NAME_FUNC_OFFSET(21033, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL,
-                     525),
-    NAME_FUNC_OFFSET(21052, glGetQueryObjectuivARB, glGetQueryObjectuivARB,
-                     NULL, 526),
-    NAME_FUNC_OFFSET(21072, glGetQueryivARB, glGetQueryivARB, NULL, 527),
-    NAME_FUNC_OFFSET(21085, glIsQueryARB, glIsQueryARB, NULL, 528),
-    NAME_FUNC_OFFSET(21095, glCompileShaderARB, glCompileShaderARB, NULL, 530),
-    NAME_FUNC_OFFSET(21111, glGetActiveUniformARB, glGetActiveUniformARB, NULL,
-                     535),
-    NAME_FUNC_OFFSET(21130, glGetShaderSourceARB, glGetShaderSourceARB, NULL,
-                     541),
-    NAME_FUNC_OFFSET(21148, glGetUniformLocationARB, glGetUniformLocationARB,
-                     NULL, 542),
-    NAME_FUNC_OFFSET(21169, glGetUniformfvARB, glGetUniformfvARB, NULL, 543),
-    NAME_FUNC_OFFSET(21184, glGetUniformivARB, glGetUniformivARB, NULL, 544),
-    NAME_FUNC_OFFSET(21199, glLinkProgramARB, glLinkProgramARB, NULL, 545),
-    NAME_FUNC_OFFSET(21213, glShaderSourceARB, glShaderSourceARB, NULL, 546),
-    NAME_FUNC_OFFSET(21228, glUniform1fARB, glUniform1fARB, NULL, 547),
-    NAME_FUNC_OFFSET(21240, glUniform1fvARB, glUniform1fvARB, NULL, 548),
-    NAME_FUNC_OFFSET(21253, glUniform1iARB, glUniform1iARB, NULL, 549),
-    NAME_FUNC_OFFSET(21265, glUniform1ivARB, glUniform1ivARB, NULL, 550),
-    NAME_FUNC_OFFSET(21278, glUniform2fARB, glUniform2fARB, NULL, 551),
-    NAME_FUNC_OFFSET(21290, glUniform2fvARB, glUniform2fvARB, NULL, 552),
-    NAME_FUNC_OFFSET(21303, glUniform2iARB, glUniform2iARB, NULL, 553),
-    NAME_FUNC_OFFSET(21315, glUniform2ivARB, glUniform2ivARB, NULL, 554),
-    NAME_FUNC_OFFSET(21328, glUniform3fARB, glUniform3fARB, NULL, 555),
-    NAME_FUNC_OFFSET(21340, glUniform3fvARB, glUniform3fvARB, NULL, 556),
-    NAME_FUNC_OFFSET(21353, glUniform3iARB, glUniform3iARB, NULL, 557),
-    NAME_FUNC_OFFSET(21365, glUniform3ivARB, glUniform3ivARB, NULL, 558),
-    NAME_FUNC_OFFSET(21378, glUniform4fARB, glUniform4fARB, NULL, 559),
-    NAME_FUNC_OFFSET(21390, glUniform4fvARB, glUniform4fvARB, NULL, 560),
-    NAME_FUNC_OFFSET(21403, glUniform4iARB, glUniform4iARB, NULL, 561),
-    NAME_FUNC_OFFSET(21415, glUniform4ivARB, glUniform4ivARB, NULL, 562),
-    NAME_FUNC_OFFSET(21428, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL,
-                     563),
-    NAME_FUNC_OFFSET(21447, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL,
-                     564),
-    NAME_FUNC_OFFSET(21466, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL,
-                     565),
-    NAME_FUNC_OFFSET(21485, glUseProgramObjectARB, glUseProgramObjectARB, NULL,
-                     566),
-    NAME_FUNC_OFFSET(21498, glValidateProgramARB, glValidateProgramARB, NULL,
-                     567),
-    NAME_FUNC_OFFSET(21516, glBindAttribLocationARB, glBindAttribLocationARB,
-                     NULL, 568),
-    NAME_FUNC_OFFSET(21537, glGetActiveAttribARB, glGetActiveAttribARB, NULL,
-                     569),
-    NAME_FUNC_OFFSET(21555, glGetAttribLocationARB, glGetAttribLocationARB,
-                     NULL, 570),
-    NAME_FUNC_OFFSET(21575, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21589, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21606, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21622, glDrawArraysInstancedARB, glDrawArraysInstancedARB,
-                     NULL, 573),
-    NAME_FUNC_OFFSET(21647, glDrawArraysInstancedARB, glDrawArraysInstancedARB,
-                     NULL, 573),
-    NAME_FUNC_OFFSET(21669, glDrawElementsInstancedARB,
-                     glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(21696, glDrawElementsInstancedARB,
-                     glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(21720, glRenderbufferStorageMultisample,
-                     glRenderbufferStorageMultisample, NULL, 575),
-    NAME_FUNC_OFFSET(21756, glBlendEquationSeparateiARB,
-                     glBlendEquationSeparateiARB, NULL, 597),
-    NAME_FUNC_OFFSET(21790, glBlendEquationiARB, glBlendEquationiARB, NULL,
-                     598),
-    NAME_FUNC_OFFSET(21816, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB,
-                     NULL, 599),
-    NAME_FUNC_OFFSET(21846, glBlendFunciARB, glBlendFunciARB, NULL, 600),
-    NAME_FUNC_OFFSET(21868, gl_dispatch_stub_698, gl_dispatch_stub_698, NULL,
-                     698),
-    NAME_FUNC_OFFSET(21884, gl_dispatch_stub_699, gl_dispatch_stub_699, NULL,
-                     699),
-    NAME_FUNC_OFFSET(21903, glPointParameterfEXT, glPointParameterfEXT, NULL,
-                     706),
-    NAME_FUNC_OFFSET(21921, glPointParameterfEXT, glPointParameterfEXT, NULL,
-                     706),
-    NAME_FUNC_OFFSET(21942, glPointParameterfEXT, glPointParameterfEXT, NULL,
-                     706),
-    NAME_FUNC_OFFSET(21964, glPointParameterfvEXT, glPointParameterfvEXT, NULL,
-                     707),
-    NAME_FUNC_OFFSET(21983, glPointParameterfvEXT, glPointParameterfvEXT, NULL,
-                     707),
-    NAME_FUNC_OFFSET(22005, glPointParameterfvEXT, glPointParameterfvEXT, NULL,
-                     707),
-    NAME_FUNC_OFFSET(22028, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL,
-                     710),
-    NAME_FUNC_OFFSET(22047, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT,
-                     NULL, 711),
-    NAME_FUNC_OFFSET(22067, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL,
-                     712),
-    NAME_FUNC_OFFSET(22086, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT,
-                     NULL, 713),
-    NAME_FUNC_OFFSET(22106, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL,
-                     714),
-    NAME_FUNC_OFFSET(22125, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT,
-                     NULL, 715),
-    NAME_FUNC_OFFSET(22145, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL,
-                     716),
-    NAME_FUNC_OFFSET(22164, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT,
-                     NULL, 717),
-    NAME_FUNC_OFFSET(22184, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL,
-                     718),
-    NAME_FUNC_OFFSET(22203, glSecondaryColor3svEXT, glSecondaryColor3svEXT,
-                     NULL, 719),
-    NAME_FUNC_OFFSET(22223, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT,
-                     NULL, 720),
-    NAME_FUNC_OFFSET(22243, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT,
-                     NULL, 721),
-    NAME_FUNC_OFFSET(22264, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT,
-                     NULL, 722),
-    NAME_FUNC_OFFSET(22284, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT,
-                     NULL, 723),
-    NAME_FUNC_OFFSET(22305, glSecondaryColor3usEXT, glSecondaryColor3usEXT,
-                     NULL, 724),
-    NAME_FUNC_OFFSET(22325, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT,
-                     NULL, 725),
-    NAME_FUNC_OFFSET(22346, glSecondaryColorPointerEXT,
-                     glSecondaryColorPointerEXT, NULL, 726),
-    NAME_FUNC_OFFSET(22370, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL,
-                     727),
-    NAME_FUNC_OFFSET(22388, glMultiDrawElementsEXT, glMultiDrawElementsEXT,
-                     NULL, 728),
-    NAME_FUNC_OFFSET(22408, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL,
-                     729),
-    NAME_FUNC_OFFSET(22426, glFogCoorddEXT, glFogCoorddEXT, NULL, 730),
-    NAME_FUNC_OFFSET(22438, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 731),
-    NAME_FUNC_OFFSET(22451, glFogCoordfEXT, glFogCoordfEXT, NULL, 732),
-    NAME_FUNC_OFFSET(22463, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 733),
-    NAME_FUNC_OFFSET(22476, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT,
-                     NULL, 735),
-    NAME_FUNC_OFFSET(22496, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT,
-                     NULL, 735),
-    NAME_FUNC_OFFSET(22520, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 752),
-    NAME_FUNC_OFFSET(22534, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 752),
-    NAME_FUNC_OFFSET(22551, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 753),
-    NAME_FUNC_OFFSET(22566, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 753),
-    NAME_FUNC_OFFSET(22584, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 754),
-    NAME_FUNC_OFFSET(22598, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 754),
-    NAME_FUNC_OFFSET(22615, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 755),
-    NAME_FUNC_OFFSET(22630, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 755),
-    NAME_FUNC_OFFSET(22648, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 756),
-    NAME_FUNC_OFFSET(22662, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 756),
-    NAME_FUNC_OFFSET(22679, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 757),
-    NAME_FUNC_OFFSET(22694, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 757),
-    NAME_FUNC_OFFSET(22712, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 758),
-    NAME_FUNC_OFFSET(22726, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 758),
-    NAME_FUNC_OFFSET(22743, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 759),
-    NAME_FUNC_OFFSET(22758, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 759),
-    NAME_FUNC_OFFSET(22776, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 760),
-    NAME_FUNC_OFFSET(22790, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 760),
-    NAME_FUNC_OFFSET(22807, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(22822, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(22840, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 762),
-    NAME_FUNC_OFFSET(22854, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 762),
-    NAME_FUNC_OFFSET(22871, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 763),
-    NAME_FUNC_OFFSET(22886, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 763),
-    NAME_FUNC_OFFSET(22904, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 764),
-    NAME_FUNC_OFFSET(22918, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 764),
-    NAME_FUNC_OFFSET(22935, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 765),
-    NAME_FUNC_OFFSET(22950, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 765),
-    NAME_FUNC_OFFSET(22968, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 766),
-    NAME_FUNC_OFFSET(22982, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 766),
-    NAME_FUNC_OFFSET(22999, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 767),
-    NAME_FUNC_OFFSET(23014, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 767),
-    NAME_FUNC_OFFSET(23032, glBindProgramNV, glBindProgramNV, NULL, 786),
-    NAME_FUNC_OFFSET(23049, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 787),
-    NAME_FUNC_OFFSET(23069, glGenProgramsNV, glGenProgramsNV, NULL, 789),
-    NAME_FUNC_OFFSET(23086, glGetVertexAttribPointervNV,
-                     glGetVertexAttribPointervNV, NULL, 795),
-    NAME_FUNC_OFFSET(23112, glGetVertexAttribPointervNV,
-                     glGetVertexAttribPointervNV, NULL, 795),
-    NAME_FUNC_OFFSET(23141, glIsProgramNV, glIsProgramNV, NULL, 799),
-    NAME_FUNC_OFFSET(23156, glPointParameteriNV, glPointParameteriNV, NULL,
-                     863),
-    NAME_FUNC_OFFSET(23174, glPointParameterivNV, glPointParameterivNV, NULL,
-                     864),
-    NAME_FUNC_OFFSET(23193, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL,
-                     867),
-    NAME_FUNC_OFFSET(23214, gl_dispatch_stub_869, gl_dispatch_stub_869, NULL,
-                     869),
-    NAME_FUNC_OFFSET(23230, glPrimitiveRestartIndexNV,
-                     glPrimitiveRestartIndexNV, NULL, 876),
-    NAME_FUNC_OFFSET(23254, gl_dispatch_stub_879, gl_dispatch_stub_879, NULL,
-                     879),
-    NAME_FUNC_OFFSET(23278, gl_dispatch_stub_879, gl_dispatch_stub_879, NULL,
-                     879),
-    NAME_FUNC_OFFSET(23305, glBindFramebufferEXT, glBindFramebufferEXT, NULL,
-                     880),
-    NAME_FUNC_OFFSET(23323, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL,
-                     881),
-    NAME_FUNC_OFFSET(23342, glCheckFramebufferStatusEXT,
-                     glCheckFramebufferStatusEXT, NULL, 882),
-    NAME_FUNC_OFFSET(23367, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT,
-                     NULL, 883),
-    NAME_FUNC_OFFSET(23388, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT,
-                     NULL, 884),
-    NAME_FUNC_OFFSET(23410, glFramebufferRenderbufferEXT,
-                     glFramebufferRenderbufferEXT, NULL, 885),
-    NAME_FUNC_OFFSET(23436, glFramebufferTexture1DEXT,
-                     glFramebufferTexture1DEXT, NULL, 886),
-    NAME_FUNC_OFFSET(23459, glFramebufferTexture2DEXT,
-                     glFramebufferTexture2DEXT, NULL, 887),
-    NAME_FUNC_OFFSET(23482, glFramebufferTexture3DEXT,
-                     glFramebufferTexture3DEXT, NULL, 888),
-    NAME_FUNC_OFFSET(23505, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL,
-                     889),
-    NAME_FUNC_OFFSET(23523, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL,
-                     890),
-    NAME_FUNC_OFFSET(23542, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL,
-                     891),
-    NAME_FUNC_OFFSET(23559, glGetFramebufferAttachmentParameterivEXT,
-                     glGetFramebufferAttachmentParameterivEXT, NULL, 892),
-    NAME_FUNC_OFFSET(23597, glGetRenderbufferParameterivEXT,
-                     glGetRenderbufferParameterivEXT, NULL, 893),
-    NAME_FUNC_OFFSET(23626, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 894),
-    NAME_FUNC_OFFSET(23642, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL,
-                     895),
-    NAME_FUNC_OFFSET(23659, glRenderbufferStorageEXT, glRenderbufferStorageEXT,
-                     NULL, 896),
-    NAME_FUNC_OFFSET(23681, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL,
-                     897),
-    NAME_FUNC_OFFSET(23699, glBindFragDataLocationEXT,
-                     glBindFragDataLocationEXT, NULL, 900),
-    NAME_FUNC_OFFSET(23722, glGetFragDataLocationEXT, glGetFragDataLocationEXT,
-                     NULL, 901),
-    NAME_FUNC_OFFSET(23744, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 902),
-    NAME_FUNC_OFFSET(23760, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT,
-                     NULL, 903),
-    NAME_FUNC_OFFSET(23781, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT,
-                     NULL, 904),
-    NAME_FUNC_OFFSET(23803, glUniform1uiEXT, glUniform1uiEXT, NULL, 905),
-    NAME_FUNC_OFFSET(23816, glUniform1uivEXT, glUniform1uivEXT, NULL, 906),
-    NAME_FUNC_OFFSET(23830, glUniform2uiEXT, glUniform2uiEXT, NULL, 907),
-    NAME_FUNC_OFFSET(23843, glUniform2uivEXT, glUniform2uivEXT, NULL, 908),
-    NAME_FUNC_OFFSET(23857, glUniform3uiEXT, glUniform3uiEXT, NULL, 909),
-    NAME_FUNC_OFFSET(23870, glUniform3uivEXT, glUniform3uivEXT, NULL, 910),
-    NAME_FUNC_OFFSET(23884, glUniform4uiEXT, glUniform4uiEXT, NULL, 911),
-    NAME_FUNC_OFFSET(23897, glUniform4uivEXT, glUniform4uivEXT, NULL, 912),
-    NAME_FUNC_OFFSET(23911, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL,
-                     913),
-    NAME_FUNC_OFFSET(23929, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL,
-                     914),
-    NAME_FUNC_OFFSET(23948, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL,
-                     915),
-    NAME_FUNC_OFFSET(23967, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT,
-                     NULL, 916),
-    NAME_FUNC_OFFSET(23987, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL,
-                     917),
-    NAME_FUNC_OFFSET(24005, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL,
-                     918),
-    NAME_FUNC_OFFSET(24024, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL,
-                     919),
-    NAME_FUNC_OFFSET(24043, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT,
-                     NULL, 920),
-    NAME_FUNC_OFFSET(24063, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL,
-                     921),
-    NAME_FUNC_OFFSET(24081, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL,
-                     922),
-    NAME_FUNC_OFFSET(24100, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL,
-                     923),
-    NAME_FUNC_OFFSET(24119, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT,
-                     NULL, 924),
-    NAME_FUNC_OFFSET(24139, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL,
-                     925),
-    NAME_FUNC_OFFSET(24158, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL,
-                     926),
-    NAME_FUNC_OFFSET(24176, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL,
-                     927),
-    NAME_FUNC_OFFSET(24195, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL,
-                     928),
-    NAME_FUNC_OFFSET(24214, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT,
-                     NULL, 929),
-    NAME_FUNC_OFFSET(24234, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL,
-                     930),
-    NAME_FUNC_OFFSET(24253, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT,
-                     NULL, 931),
-    NAME_FUNC_OFFSET(24273, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT,
-                     NULL, 932),
-    NAME_FUNC_OFFSET(24293, glVertexAttribIPointerEXT,
-                     glVertexAttribIPointerEXT, NULL, 933),
-    NAME_FUNC_OFFSET(24316, glFramebufferTextureLayerEXT,
-                     glFramebufferTextureLayerEXT, NULL, 934),
-    NAME_FUNC_OFFSET(24342, glFramebufferTextureLayerEXT,
-                     glFramebufferTextureLayerEXT, NULL, 934),
-    NAME_FUNC_OFFSET(24371, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL,
-                     935),
-    NAME_FUNC_OFFSET(24384, glDisableIndexedEXT, glDisableIndexedEXT, NULL,
-                     936),
-    NAME_FUNC_OFFSET(24395, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 937),
-    NAME_FUNC_OFFSET(24405, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT,
-                     NULL, 938),
-    NAME_FUNC_OFFSET(24421, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT,
-                     NULL, 939),
-    NAME_FUNC_OFFSET(24437, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL,
-                     940),
-    NAME_FUNC_OFFSET(24450, glGetTexParameterIivEXT, glGetTexParameterIivEXT,
-                     NULL, 943),
-    NAME_FUNC_OFFSET(24471, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT,
-                     NULL, 944),
-    NAME_FUNC_OFFSET(24493, glTexParameterIivEXT, glTexParameterIivEXT, NULL,
-                     945),
-    NAME_FUNC_OFFSET(24511, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL,
-                     946),
-    NAME_FUNC_OFFSET(24530, glBeginConditionalRenderNV,
-                     glBeginConditionalRenderNV, NULL, 947),
-    NAME_FUNC_OFFSET(24555, glEndConditionalRenderNV, glEndConditionalRenderNV,
-                     NULL, 948),
-    NAME_FUNC_OFFSET(24578, glBeginTransformFeedbackEXT,
-                     glBeginTransformFeedbackEXT, NULL, 949),
-    NAME_FUNC_OFFSET(24603, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL,
-                     950),
-    NAME_FUNC_OFFSET(24620, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL,
-                     952),
-    NAME_FUNC_OFFSET(24638, glEndTransformFeedbackEXT,
-                     glEndTransformFeedbackEXT, NULL, 953),
-    NAME_FUNC_OFFSET(24661, glGetTransformFeedbackVaryingEXT,
-                     glGetTransformFeedbackVaryingEXT, NULL, 954),
-    NAME_FUNC_OFFSET(24691, glTransformFeedbackVaryingsEXT,
-                     glTransformFeedbackVaryingsEXT, NULL, 955),
-    NAME_FUNC_OFFSET(24719, glProvokingVertexEXT, glProvokingVertexEXT, NULL,
-                     956),
-    NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
-};
-
-#undef NAME_FUNC_OFFSET
diff --git a/xorg-server/glx/glthread.h b/xorg-server/glx/glthread.h
deleted file mode 100644
index 62c9bd4f1..000000000
--- a/xorg-server/glx/glthread.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.2
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * Thread support for gl dispatch.
- *
- * Initial version by John Stone (j.stone@acm.org) (johns@cs.umr.edu)
- *                and Christoph Poliwoda (poliwoda@volumegraphics.com)
- * Revised by Keith Whitwell
- * Adapted for new gl dispatcher by Brian Paul
- *
- *
- *
- * DOCUMENTATION
- *
- * This thread module exports the following types:
- *   _glthread_TSD     Thread-specific data area
- *   _glthread_Thread  Thread datatype
- *   _glthread_Mutex   Mutual exclusion lock
- *
- * Macros:
- *   _glthread_DECLARE_STATIC_MUTEX(name)   Declare a non-local mutex
- *   _glthread_INIT_MUTEX(name)             Initialize a mutex
- *   _glthread_LOCK_MUTEX(name)             Lock a mutex
- *   _glthread_UNLOCK_MUTEX(name)           Unlock a mutex
- *
- * Functions:
- *   _glthread_GetID(v)      Get integer thread ID
- *   _glthread_InitTSD()     Initialize thread-specific data
- *   _glthread_GetTSD()      Get thread-specific data
- *   _glthread_SetTSD()      Set thread-specific data
- *
- */
-
-/*
- * If this file is accidentally included by a non-threaded build,
- * it should not cause the build to fail, or otherwise cause problems.
- * In general, it should only be included when needed however.
- */
-
-#ifndef GLTHREAD_H
-#define GLTHREAD_H
-
-#if defined(USE_MGL_NAMESPACE)
-#define _glapi_Dispatch _mglapi_Dispatch
-#endif
-
-#if (defined(PTHREADS) || defined(WIN32_THREADS)) \
-    && !defined(THREADS)
-#define THREADS
-#endif
-
-#ifdef VMS
-#include <GL/vms_x_fix.h>
-#endif
-
-/*
- * POSIX threads. This should be your choice in the Unix world
- * whenever possible.  When building with POSIX threads, be sure
- * to enable any compiler flags which will cause the MT-safe
- * libc (if one exists) to be used when linking, as well as any
- * header macros for MT-safe errno, etc.  For Solaris, this is the -mt
- * compiler flag.  On Solaris with gcc, use -D_REENTRANT to enable
- * proper compiling for MT-safe libc etc.
- */
-#if defined(PTHREADS)
-#include <pthread.h>            /* POSIX threads headers */
-
-typedef struct {
-    pthread_key_t key;
-    int initMagic;
-} _glthread_TSD;
-
-typedef pthread_t _glthread_Thread;
-
-typedef pthread_mutex_t _glthread_Mutex;
-
-#define _glthread_DECLARE_STATIC_MUTEX(name) \
-   static _glthread_Mutex name = PTHREAD_MUTEX_INITIALIZER
-
-#define _glthread_INIT_MUTEX(name) \
-   pthread_mutex_init(&(name), NULL)
-
-#define _glthread_DESTROY_MUTEX(name) \
-   pthread_mutex_destroy(&(name))
-
-#define _glthread_LOCK_MUTEX(name) \
-   (void) pthread_mutex_lock(&(name))
-
-#define _glthread_UNLOCK_MUTEX(name) \
-   (void) pthread_mutex_unlock(&(name))
-
-#endif                          /* PTHREADS */
-
-/*
- * Solaris threads. Use only up to Solaris 2.4.
- * Solaris 2.5 and higher provide POSIX threads.
- * Be sure to compile with -mt on the Solaris compilers, or
- * use -D_REENTRANT if using gcc.
- */
-
-/*
- * Windows threads. Should work with Windows NT and 95.
- * IMPORTANT: Link with multithreaded runtime library when THREADS are
- * used!
- */
-#ifdef WIN32_THREADS
-#include <windows.h>
-
-typedef struct {
-    DWORD key;
-    int initMagic;
-} _glthread_TSD;
-
-typedef HANDLE _glthread_Thread;
-
-typedef CRITICAL_SECTION _glthread_Mutex;
-
-#define _glthread_DECLARE_STATIC_MUTEX(name)  /*static*/ _glthread_Mutex name = {0,0,0,0,0,0}
-#define _glthread_INIT_MUTEX(name)  InitializeCriticalSection(&name)
-#define _glthread_DESTROY_MUTEX(name)  DeleteCriticalSection(&name)
-#define _glthread_LOCK_MUTEX(name)  EnterCriticalSection(&name)
-#define _glthread_UNLOCK_MUTEX(name)  LeaveCriticalSection(&name)
-
-#endif                          /* WIN32_THREADS */
-
-/*
- * BeOS threads. R5.x required.
- */
-#ifdef BEOS_THREADS
-
-#include <kernel/OS.h>
-#include <support/TLS.h>
-
-typedef struct {
-    int32 key;
-    int initMagic;
-} _glthread_TSD;
-
-typedef thread_id _glthread_Thread;
-
-/* Use Benaphore, aka speeder semaphore */
-typedef struct {
-    int32 lock;
-    sem_id sem;
-} benaphore;
-typedef benaphore _glthread_Mutex;
-
-#define _glthread_DECLARE_STATIC_MUTEX(name)  static _glthread_Mutex name = { 0, 0 }
-#define _glthread_INIT_MUTEX(name)    	name.sem = create_sem(0, #name"_benaphore"), name.lock = 0
-#define _glthread_DESTROY_MUTEX(name) 	delete_sem(name.sem), name.lock = 0
-#define _glthread_LOCK_MUTEX(name)    	if (name.sem == 0) _glthread_INIT_MUTEX(name); \
-									  	if (atomic_add(&(name.lock), 1) >= 1) acquire_sem(name.sem)
-#define _glthread_UNLOCK_MUTEX(name)  	if (atomic_add(&(name.lock), -1) > 1) release_sem(name.sem)
-
-#endif                          /* BEOS_THREADS */
-
-#ifndef THREADS
-
-/*
- * THREADS not defined
- */
-
-typedef int _glthread_TSD;
-
-typedef int _glthread_Thread;
-
-typedef int _glthread_Mutex;
-
-#define _glthread_DECLARE_STATIC_MUTEX(name)  static _glthread_Mutex name = 0
-
-#define _glthread_INIT_MUTEX(name)  (void) name
-
-#define _glthread_DESTROY_MUTEX(name)  (void) name
-
-#define _glthread_LOCK_MUTEX(name)  (void) name
-
-#define _glthread_UNLOCK_MUTEX(name)  (void) name
-
-#endif                          /* THREADS */
-
-/*
- * Platform independent thread specific data API.
- */
-
-extern unsigned long
- _glthread_GetID(void);
-
-extern void
- _glthread_InitTSD(_glthread_TSD *);
-
-extern void *_glthread_GetTSD(_glthread_TSD *);
-
-extern void
- _glthread_SetTSD(_glthread_TSD *, void *);
-
-#if defined(GLX_USE_TLS)
-
-extern TLS struct _glapi_table *_glapi_tls_Dispatch;
-
-#define GET_DISPATCH() _glapi_tls_Dispatch
-
-#elif !defined(GL_CALL)
-#if defined(THREADS)
-#define GET_DISPATCH() \
-   ((__builtin_expect( _glapi_Dispatch != NULL, 1 )) \
-       ? _glapi_Dispatch : _glapi_get_dispatch())
-#else
-#define GET_DISPATCH() _glapi_Dispatch
-#endif                          /* defined(THREADS) */
-#endif                          /* ndef GL_CALL */
-
-#endif                          /* THREADS_H */
diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c
index 73e76ca9f..64ebf9ecd 100644
--- a/xorg-server/glx/glxcmds.c
+++ b/xorg-server/glx/glxcmds.c
@@ -42,10 +42,6 @@
 #include <windowstr.h>
 #include "glxutil.h"
 #include "glxext.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 #include "indirect_dispatch.h"
 #include "indirect_table.h"
 #include "indirect_util.h"
@@ -299,7 +295,7 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId,
     glxc->id = gcId;
     glxc->share_id = shareList;
     glxc->idExists = GL_TRUE;
-    glxc->isCurrent = GL_FALSE;
+    glxc->currentClient = NULL;
     glxc->isDirect = isDirect;
     glxc->hasUnflushedCommands = GL_FALSE;
     glxc->renderMode = GL_RENDER;
@@ -406,9 +402,7 @@ __glXDisp_DestroyContext(__GLXclientState * cl, GLbyte * pc)
                          &glxc, &err))
         return err;
 
-    glxc->idExists = GL_FALSE;
-    if (!glxc->isCurrent)
-        FreeResourceByType(req->context, __glXContextRes, FALSE);
+    FreeResourceByType(req->context, __glXContextRes, FALSE);
 
     return Success;
 }
@@ -444,7 +438,7 @@ StopUsingContext(__GLXcontext * glxc)
             /* Tell server GL library */
             __glXLastContext = 0;
         }
-        glxc->isCurrent = GL_FALSE;
+        glxc->currentClient = NULL;
         if (!glxc->idExists) {
             FreeResourceByType(glxc->id, __glXContextRes, FALSE);
         }
@@ -454,8 +448,8 @@ StopUsingContext(__GLXcontext * glxc)
 static void
 StartUsingContext(__GLXclientState * cl, __GLXcontext * glxc)
 {
-    glxc->isCurrent = GL_TRUE;
     __glXLastContext = glxc;
+    glxc->currentClient = cl->client;
 }
 
 /**
@@ -589,7 +583,7 @@ DoMakeCurrent(__GLXclientState * cl,
 
         if (!validGlxContext(client, contextId, DixUseAccess, &glxc, &error))
             return error;
-        if ((glxc != prevglxc) && glxc->isCurrent) {
+        if ((glxc != prevglxc) && glxc->currentClient) {
             /* Context is current to somebody else */
             return BadAccess;
         }
@@ -619,7 +613,7 @@ DoMakeCurrent(__GLXclientState * cl,
          */
         if (prevglxc->hasUnflushedCommands) {
             if (__glXForceCurrent(cl, tag, (int *) &error)) {
-                CALL_Flush(GET_DISPATCH(), ());
+                glFlush();
                 prevglxc->hasUnflushedCommands = GL_FALSE;
             }
             else {
@@ -652,7 +646,7 @@ DoMakeCurrent(__GLXclientState * cl,
             return __glXError(GLXBadContext);
         }
 
-        glxc->isCurrent = GL_TRUE;
+        glxc->currentClient = client;
     }
 
     StopUsingContext(prevglxc);
@@ -802,7 +796,7 @@ __glXDisp_WaitGL(__GLXclientState * cl, GLbyte * pc)
         if (!__glXForceCurrent(cl, req->contextTag, &error))
             return error;
 
-        CALL_Finish(GET_DISPATCH(), ());
+        glFinish();
     }
 
     if (glxc && glxc->drawPriv->waitGL)
@@ -873,7 +867,7 @@ __glXDisp_CopyContext(__GLXclientState * cl, GLbyte * pc)
     /*
      ** The destination context must not be current for any client.
      */
-    if (dst->isCurrent) {
+    if (dst->currentClient) {
         client->errorValue = dest;
         return BadAccess;
     }
@@ -900,7 +894,7 @@ __glXDisp_CopyContext(__GLXclientState * cl, GLbyte * pc)
              ** Do whatever is needed to make sure that all preceding requests
              ** in both streams are completed before the copy is executed.
              */
-            CALL_Finish(GET_DISPATCH(), ());
+            glFinish();
             tagcx->hasUnflushedCommands = GL_FALSE;
         }
         else {
@@ -1249,7 +1243,8 @@ DoCreateGLXPixmap(ClientPtr client, __GLXscreen * pGlxScreen,
     err = DoCreateGLXDrawable(client, pGlxScreen, config, pDraw, drawableId,
                               glxDrawableId, GLX_DRAWABLE_PIXMAP);
 
-    ((PixmapPtr) pDraw)->refcnt++;
+    if (err == Success)
+        ((PixmapPtr) pDraw)->refcnt++;
 
     return err;
 }
@@ -1676,7 +1671,7 @@ __glXDisp_SwapBuffers(__GLXclientState * cl, GLbyte * pc)
              ** Do whatever is needed to make sure that all preceding requests
              ** in both streams are completed before the swap is executed.
              */
-            CALL_Finish(GET_DISPATCH(), ());
+            glFinish();
             glxc->hasUnflushedCommands = GL_FALSE;
         }
         else {
@@ -1873,7 +1868,7 @@ __glXDisp_CopySubBufferMESA(__GLXclientState * cl, GLbyte * pc)
              ** Do whatever is needed to make sure that all preceding requests
              ** in both streams are completed before the swap is executed.
              */
-            CALL_Finish(GET_DISPATCH(), ());
+            glFinish();
             glxc->hasUnflushedCommands = GL_FALSE;
         }
         else {
diff --git a/xorg-server/glx/glxcmdsswap.c b/xorg-server/glx/glxcmdsswap.c
index 43f88d335..5d179f317 100644
--- a/xorg-server/glx/glxcmdsswap.c
+++ b/xorg-server/glx/glxcmdsswap.c
@@ -40,10 +40,6 @@
 #include <pixmapstr.h>
 #include <windowstr.h>
 #include "glxext.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 #include "indirect_dispatch.h"
 #include "indirect_table.h"
 #include "indirect_util.h"
diff --git a/xorg-server/glx/glxcontext.h b/xorg-server/glx/glxcontext.h
index 3d08c9929..677898a67 100644
--- a/xorg-server/glx/glxcontext.h
+++ b/xorg-server/glx/glxcontext.h
@@ -69,6 +69,11 @@ struct __GLXcontext {
     __GLXscreen *pGlxScreen;
 
     /*
+     ** If this context is current for a client, this will be that client
+     */
+    ClientPtr currentClient;
+
+    /*
      ** The XID of this context.
      */
     XID id;
@@ -84,11 +89,6 @@ struct __GLXcontext {
     GLboolean idExists;
 
     /*
-     ** Whether this context is current for some client.
-     */
-    GLboolean isCurrent;
-
-    /*
      ** Whether this context is a direct rendering context.
      */
     GLboolean isDirect;
diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c
deleted file mode 100644
index 1ac683978..000000000
--- a/xorg-server/glx/glxdri.c
+++ /dev/null
@@ -1,1172 +0,0 @@
-/*
- * Copyright © 2006 Red Hat, Inc
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Red Hat,
- * Inc not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission.  Red Hat, Inc makes no representations about the
- * suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * RED HAT, INC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL RED HAT, INC BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <dlfcn.h>
-
-#include <drm.h>
-#include <GL/gl.h>
-#include <GL/internal/dri_interface.h>
-#include <GL/glxtokens.h>
-
-#include <windowstr.h>
-#include <os.h>
-#include <damage.h>
-
-#define _XF86DRI_SERVER_
-#include <drm_sarea.h>
-#include <xf86drm.h>
-#include <X11/dri/xf86driproto.h>
-#include <xf86str.h>
-#include <xf86.h>
-#include <dri.h>
-
-#include "servermd.h"
-
-#define DRI_NEW_INTERFACE_ONLY
-#include "glxserver.h"
-#include "glxutil.h"
-#include "glxdricommon.h"
-
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
-#include "extension_string.h"
-
-typedef struct __GLXDRIscreen __GLXDRIscreen;
-typedef struct __GLXDRIcontext __GLXDRIcontext;
-typedef struct __GLXDRIdrawable __GLXDRIdrawable;
-
-struct __GLXDRIscreen {
-    __GLXscreen base;
-    __DRIscreen *driScreen;
-    void *driver;
-
-    xf86EnterVTProc *enterVT;
-    xf86LeaveVTProc *leaveVT;
-
-    const __DRIcoreExtension *core;
-    const __DRIlegacyExtension *legacy;
-    const __DRIcopySubBufferExtension *copySubBuffer;
-    const __DRIswapControlExtension *swapControl;
-    const __DRIconfig **driConfigs;
-
-#ifdef __DRI_TEX_OFFSET
-    const __DRItexOffsetExtension *texOffset;
-    DRITexOffsetStartProcPtr texOffsetStart;
-    DRITexOffsetFinishProcPtr texOffsetFinish;
-    __GLXDRIdrawable *texOffsetOverride[16];
-    GLuint lastTexOffsetOverride;
-#endif
-
-    unsigned char glx_enable_bits[__GLX_EXT_BYTES];
-};
-
-struct __GLXDRIcontext {
-    __GLXcontext base;
-    __DRIcontext *driContext;
-    XID hwContextID;
-};
-
-struct __GLXDRIdrawable {
-    __GLXdrawable base;
-    __DRIdrawable *driDrawable;
-
-    /* Pulled in from old __GLXpixmap */
-#ifdef __DRI_TEX_OFFSET
-    GLint texname;
-    __GLXDRIcontext *ctx;
-    unsigned long long offset;
-    DamagePtr pDamage;
-#endif
-};
-
-static void
-__glXDRIleaveServer(GLboolean rendering)
-{
-    int i;
-
-    for (i = 0; rendering && i < screenInfo.numScreens; i++) {
-        __GLXDRIscreen *const screen =
-            (__GLXDRIscreen *) glxGetScreen(screenInfo.screens[i]);
-        GLuint lastOverride = screen->lastTexOffsetOverride;
-
-        if (lastOverride) {
-            __GLXDRIdrawable **texOffsetOverride = screen->texOffsetOverride;
-            int j;
-
-            for (j = 0; j < lastOverride; j++) {
-                __GLXDRIdrawable *pGlxPix = texOffsetOverride[j];
-
-                if (pGlxPix && pGlxPix->texname) {
-                    pGlxPix->offset =
-                        screen->texOffsetStart((PixmapPtr) pGlxPix->base.pDraw);
-                }
-            }
-        }
-    }
-
-    DRIBlockHandler(NULL, NULL, NULL);
-
-    for (i = 0; rendering && i < screenInfo.numScreens; i++) {
-        __GLXDRIscreen *const screen =
-            (__GLXDRIscreen *) glxGetScreen(screenInfo.screens[i]);
-        GLuint lastOverride = screen->lastTexOffsetOverride;
-
-        if (lastOverride) {
-            __GLXDRIdrawable **texOffsetOverride = screen->texOffsetOverride;
-            int j;
-
-            for (j = 0; j < lastOverride; j++) {
-                __GLXDRIdrawable *pGlxPix = texOffsetOverride[j];
-
-                if (pGlxPix && pGlxPix->texname) {
-                    screen->texOffset->setTexOffset(pGlxPix->ctx->driContext,
-                                                    pGlxPix->texname,
-                                                    pGlxPix->offset,
-                                                    pGlxPix->base.pDraw->depth,
-                                                    ((PixmapPtr) pGlxPix->base.
-                                                     pDraw)->devKind);
-                }
-            }
-        }
-    }
-}
-
-static void
-__glXDRIenterServer(GLboolean rendering)
-{
-    int i;
-
-    for (i = 0; rendering && i < screenInfo.numScreens; i++) {
-        __GLXDRIscreen *const screen = (__GLXDRIscreen *)
-            glxGetScreen(screenInfo.screens[i]);
-
-        if (screen->lastTexOffsetOverride) {
-            CALL_Flush(GET_DISPATCH(), ());
-            break;
-        }
-    }
-
-    DRIWakeupHandler(NULL, 0, NULL);
-}
-
-static void
-__glXDRIdoReleaseTexImage(__GLXDRIscreen * screen, __GLXDRIdrawable * drawable)
-{
-    GLuint lastOverride = screen->lastTexOffsetOverride;
-
-    if (lastOverride) {
-        __GLXDRIdrawable **texOffsetOverride = screen->texOffsetOverride;
-        int i;
-
-        for (i = 0; i < lastOverride; i++) {
-            if (texOffsetOverride[i] == drawable) {
-                if (screen->texOffsetFinish)
-                    screen->texOffsetFinish((PixmapPtr) drawable->base.pDraw);
-
-                texOffsetOverride[i] = NULL;
-
-                if (i + 1 == lastOverride) {
-                    lastOverride = 0;
-
-                    while (i--) {
-                        if (texOffsetOverride[i]) {
-                            lastOverride = i + 1;
-                            break;
-                        }
-                    }
-
-                    screen->lastTexOffsetOverride = lastOverride;
-
-                    break;
-                }
-            }
-        }
-    }
-}
-
-static void
-__glXDRIdrawableDestroy(__GLXdrawable * drawable)
-{
-    __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
-    __GLXDRIscreen *screen;
-    int i;
-
-    for (i = 0; i < screenInfo.numScreens; i++) {
-        screen = (__GLXDRIscreen *) glxGetScreen(screenInfo.screens[i]);
-        __glXDRIdoReleaseTexImage(screen, private);
-    }
-
-    /* If the X window was destroyed, the dri DestroyWindow hook will
-     * aready have taken care of this, so only call if pDraw isn't NULL. */
-    if (drawable->pDraw != NULL) {
-        screen = (__GLXDRIscreen *) glxGetScreen(drawable->pDraw->pScreen);
-        (*screen->core->destroyDrawable) (private->driDrawable);
-
-        __glXenterServer(GL_FALSE);
-        DRIDestroyDrawable(drawable->pDraw->pScreen,
-                           serverClient, drawable->pDraw);
-        __glXleaveServer(GL_FALSE);
-    }
-
-    __glXDrawableRelease(drawable);
-
-    free(private);
-}
-
-static GLboolean
-__glXDRIdrawableSwapBuffers(ClientPtr client, __GLXdrawable * basePrivate)
-{
-    __GLXDRIdrawable *private = (__GLXDRIdrawable *) basePrivate;
-    __GLXDRIscreen *screen =
-        (__GLXDRIscreen *) glxGetScreen(basePrivate->pDraw->pScreen);
-
-    (*screen->core->swapBuffers) (private->driDrawable);
-
-    return TRUE;
-}
-
-static int
-__glXDRIdrawableSwapInterval(__GLXdrawable * baseDrawable, int interval)
-{
-    __GLXDRIdrawable *draw = (__GLXDRIdrawable *) baseDrawable;
-    __GLXDRIscreen *screen =
-        (__GLXDRIscreen *) glxGetScreen(baseDrawable->pDraw->pScreen);
-
-    if (screen->swapControl)
-        screen->swapControl->setSwapInterval(draw->driDrawable, interval);
-
-    return 0;
-}
-
-static void
-__glXDRIdrawableCopySubBuffer(__GLXdrawable * basePrivate,
-                              int x, int y, int w, int h)
-{
-    __GLXDRIdrawable *private = (__GLXDRIdrawable *) basePrivate;
-    __GLXDRIscreen *screen = (__GLXDRIscreen *)
-        glxGetScreen(basePrivate->pDraw->pScreen);
-
-    if (screen->copySubBuffer)
-        screen->copySubBuffer->copySubBuffer(private->driDrawable, x, y, w, h);
-}
-
-static void
-__glXDRIcontextDestroy(__GLXcontext * baseContext)
-{
-    __GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
-    __GLXDRIscreen *screen = (__GLXDRIscreen *) context->base.pGlxScreen;
-    Bool retval;
-
-    screen->core->destroyContext(context->driContext);
-
-    __glXenterServer(GL_FALSE);
-    retval = DRIDestroyContext(baseContext->pGlxScreen->pScreen,
-                               context->hwContextID);
-    __glXleaveServer(GL_FALSE);
-
-    __glXContextDestroy(&context->base);
-    free(context);
-}
-
-static int
-__glXDRIcontextMakeCurrent(__GLXcontext * baseContext)
-{
-    __GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
-    __GLXDRIscreen *screen = (__GLXDRIscreen *) context->base.pGlxScreen;
-    __GLXDRIdrawable *draw = (__GLXDRIdrawable *) baseContext->drawPriv;
-    __GLXDRIdrawable *read = (__GLXDRIdrawable *) baseContext->readPriv;
-
-    return (*screen->core->bindContext) (context->driContext,
-                                         draw->driDrawable, read->driDrawable);
-}
-
-static int
-__glXDRIcontextLoseCurrent(__GLXcontext * baseContext)
-{
-    __GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
-    __GLXDRIscreen *screen = (__GLXDRIscreen *) context->base.pGlxScreen;
-
-    return (*screen->core->unbindContext) (context->driContext);
-}
-
-static int
-__glXDRIcontextCopy(__GLXcontext * baseDst, __GLXcontext * baseSrc,
-                    unsigned long mask)
-{
-    __GLXDRIcontext *dst = (__GLXDRIcontext *) baseDst;
-    __GLXDRIcontext *src = (__GLXDRIcontext *) baseSrc;
-    __GLXDRIscreen *screen = (__GLXDRIscreen *) dst->base.pGlxScreen;
-
-    return (*screen->core->copyContext) (dst->driContext,
-                                         src->driContext, mask);
-}
-
-static void
-glxFillAlphaChannel(CARD32 *pixels, CARD32 rowstride, int width, int height)
-{
-    int i;
-    CARD32 *p, *end;
-
-    rowstride /= 4;
-
-    for (i = 0; i < height; i++) {
-        p = pixels;
-        end = p + width;
-        while (p < end)
-            *p++ |= 0xFF000000;
-        pixels += rowstride;
-    }
-}
-
-static Bool
-testTexOffset(__GLXDRIscreen * const screen, PixmapPtr pPixmap)
-{
-    Bool ret;
-
-    if (!screen->texOffsetStart || !screen->texOffset)
-        return FALSE;
-
-    __glXenterServer(GL_FALSE);
-    ret = screen->texOffsetStart(pPixmap) != ~0ULL;
-    __glXleaveServer(GL_FALSE);
-
-    return ret;
-}
-
-/*
- * (sticking this here for lack of a better place)
- * Known issues with the GLX_EXT_texture_from_pixmap implementation:
- * - In general we ignore the fbconfig, lots of examples follow
- * - No fbconfig handling for multiple mipmap levels
- * - No fbconfig handling for 1D textures
- * - No fbconfig handling for TEXTURE_TARGET
- * - No fbconfig exposure of Y inversion state
- * - No GenerateMipmapEXT support (due to no FBO support)
- * - No support for anything but 16bpp and 32bpp-sparse pixmaps
- */
-
-static int
-__glXDRIbindTexImage(__GLXcontext * baseContext,
-                     int buffer, __GLXdrawable * glxPixmap)
-{
-    RegionPtr pRegion = NULL;
-    PixmapPtr pixmap;
-    int bpp, override = 0, texname;
-    GLenum format, type;
-    ScreenPtr pScreen = glxPixmap->pDraw->pScreen;
-    __GLXDRIdrawable *driDraw = (__GLXDRIdrawable *) glxPixmap;
-    __GLXDRIscreen *const screen = (__GLXDRIscreen *) glxGetScreen(pScreen);
-
-    CALL_GetIntegerv(GET_DISPATCH(), (glxPixmap->target == GL_TEXTURE_2D ?
-                                      GL_TEXTURE_BINDING_2D :
-                                      GL_TEXTURE_BINDING_RECTANGLE_NV,
-                                      &texname));
-
-    if (!texname)
-        return __glXError(GLXBadContextState);
-
-    pixmap = (PixmapPtr) glxPixmap->pDraw;
-
-    if (testTexOffset(screen, pixmap)) {
-        __GLXDRIdrawable **texOffsetOverride = screen->texOffsetOverride;
-        int i, firstEmpty = 16;
-
-        for (i = 0; i < 16; i++) {
-            if (texOffsetOverride[i] == driDraw)
-                goto alreadyin;
-
-            if (firstEmpty == 16 && !texOffsetOverride[i])
-                firstEmpty = i;
-        }
-
-        if (firstEmpty == 16) {
-            ErrorF("%s: Failed to register texture offset override\n",
-                   __func__);
-            goto nooverride;
-        }
-
-        if (firstEmpty >= screen->lastTexOffsetOverride)
-            screen->lastTexOffsetOverride = firstEmpty + 1;
-
-        texOffsetOverride[firstEmpty] = driDraw;
-
- alreadyin:
-        override = 1;
-
-        driDraw->ctx = (__GLXDRIcontext *) baseContext;
-
-        if (texname == driDraw->texname)
-            return Success;
-
-        driDraw->texname = texname;
-
-        screen->texOffset->setTexOffset(driDraw->ctx->driContext, texname, 0,
-                                        pixmap->drawable.depth,
-                                        pixmap->devKind);
-    }
- nooverride:
-
-    if (!driDraw->pDamage) {
-        if (!override) {
-            driDraw->pDamage = DamageCreate(NULL, NULL, DamageReportNone,
-                                            TRUE, pScreen, NULL);
-            if (!driDraw->pDamage)
-                return BadAlloc;
-
-            DamageRegister((DrawablePtr) pixmap, driDraw->pDamage);
-        }
-
-        pRegion = NULL;
-    }
-    else {
-        pRegion = DamageRegion(driDraw->pDamage);
-        if (RegionNil(pRegion))
-            return Success;
-    }
-
-    /* XXX 24bpp packed, 8, etc */
-    if (pixmap->drawable.depth >= 24) {
-        bpp = 4;
-        format = GL_BGRA;
-        type =
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-            !override ? GL_UNSIGNED_INT_8_8_8_8_REV :
-#endif
-            GL_UNSIGNED_BYTE;
-    }
-    else {
-        bpp = 2;
-        format = GL_RGB;
-        type = GL_UNSIGNED_SHORT_5_6_5;
-    }
-
-    if (pRegion == NULL) {
-        void *data = NULL;
-
-        if (!override) {
-            unsigned pitch = PixmapBytePad(pixmap->drawable.width,
-                                           pixmap->drawable.depth);
-
-            data = malloc(pitch * pixmap->drawable.height);
-
-            __glXenterServer(GL_FALSE);
-            pScreen->GetImage(&pixmap->drawable, 0 /*pixmap->drawable.x */ ,
-                              0 /*pixmap->drawable.y */ ,
-                              pixmap->drawable.width,
-                              pixmap->drawable.height, ZPixmap, ~0, data);
-            __glXleaveServer(GL_FALSE);
-
-            if (pixmap->drawable.depth == 24)
-                glxFillAlphaChannel(data,
-                                    pitch,
-                                    pixmap->drawable.width,
-                                    pixmap->drawable.height);
-
-            CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
-                                              pitch / bpp));
-            CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, 0));
-            CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, 0));
-        }
-
-        CALL_TexImage2D(GET_DISPATCH(),
-                        (glxPixmap->target,
-                         0,
-                         bpp == 4 ? 4 : 3,
-                         pixmap->drawable.width,
-                         pixmap->drawable.height, 0, format, type, data));
-
-        free(data);
-    }
-    else if (!override) {
-        int i, numRects;
-        BoxPtr p;
-
-        numRects = RegionNumRects(pRegion);
-        p = RegionRects(pRegion);
-
-        CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, 0));
-        CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, 0));
-
-        for (i = 0; i < numRects; i++) {
-            unsigned pitch = PixmapBytePad(p[i].x2 - p[i].x1,
-                                           pixmap->drawable.depth);
-            void *data = malloc(pitch * (p[i].y2 - p[i].y1));
-
-            __glXenterServer(GL_FALSE);
-            pScreen->GetImage(&pixmap->drawable, /*pixmap->drawable.x + */
-                              p[i].x1,
-                              /*pixmap->drawable.y */ +p[i].y1,
-                              p[i].x2 - p[i].x1,
-                              p[i].y2 - p[i].y1, ZPixmap, ~0, data);
-            __glXleaveServer(GL_FALSE);
-
-            if (pixmap->drawable.depth == 24)
-                glxFillAlphaChannel(data,
-                                    pitch,
-                                    p[i].x2 - p[i].x1, p[i].y2 - p[i].y1);
-
-            CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
-                                              pitch / bpp));
-
-            CALL_TexSubImage2D(GET_DISPATCH(),
-                               (glxPixmap->target,
-                                0,
-                                p[i].x1, p[i].y1,
-                                p[i].x2 - p[i].x1, p[i].y2 - p[i].y1,
-                                format, type, data));
-
-            free(data);
-        }
-    }
-
-    if (!override)
-        DamageEmpty(driDraw->pDamage);
-
-    return Success;
-}
-
-static int
-__glXDRIreleaseTexImage(__GLXcontext * baseContext,
-                        int buffer, __GLXdrawable * pixmap)
-{
-    __GLXDRIscreen *screen =
-        (__GLXDRIscreen *) glxGetScreen(pixmap->pDraw->pScreen);
-    __GLXDRIdrawable *drawable = (__GLXDRIdrawable *) pixmap;
-
-    __glXDRIdoReleaseTexImage(screen, drawable);
-
-    return Success;
-}
-
-static __GLXtextureFromPixmap __glXDRItextureFromPixmap = {
-    __glXDRIbindTexImage,
-    __glXDRIreleaseTexImage
-};
-
-static void
-__glXDRIscreenDestroy(__GLXscreen * baseScreen)
-{
-    int i;
-
-    __GLXDRIscreen *screen = (__GLXDRIscreen *) baseScreen;
-
-    screen->core->destroyScreen(screen->driScreen);
-
-    dlclose(screen->driver);
-
-    __glXScreenDestroy(baseScreen);
-
-    if (screen->driConfigs) {
-        for (i = 0; screen->driConfigs[i] != NULL; i++)
-            free((__DRIconfig **) screen->driConfigs[i]);
-        free(screen->driConfigs);
-    }
-
-    free(screen);
-}
-
-static __GLXcontext *
-__glXDRIscreenCreateContext(__GLXscreen * baseScreen,
-                            __GLXconfig * glxConfig,
-                            __GLXcontext * baseShareContext,
-                            unsigned num_attribs,
-                            const uint32_t *attribs,
-                            int *error)
-{
-    __GLXDRIscreen *screen = (__GLXDRIscreen *) baseScreen;
-    __GLXDRIcontext *context, *shareContext;
-    __GLXDRIconfig *config = (__GLXDRIconfig *) glxConfig;
-    VisualPtr visual;
-    int i;
-    GLboolean retval;
-    __DRIcontext *driShare;
-    drm_context_t hwContext;
-    ScreenPtr pScreen = baseScreen->pScreen;
-
-    /* DRI1 cannot support createContextAttribs, so these parameters will
-     * never be used.
-     */
-    (void) num_attribs;
-    (void) attribs;
-    (void) error;
-
-    shareContext = (__GLXDRIcontext *) baseShareContext;
-    if (shareContext)
-        driShare = shareContext->driContext;
-    else
-        driShare = NULL;
-
-    if (baseShareContext && baseShareContext->isDirect)
-        return NULL;
-
-    context = calloc(1, sizeof *context);
-    if (context == NULL)
-        return NULL;
-
-    context->base.destroy = __glXDRIcontextDestroy;
-    context->base.makeCurrent = __glXDRIcontextMakeCurrent;
-    context->base.loseCurrent = __glXDRIcontextLoseCurrent;
-    context->base.copy = __glXDRIcontextCopy;
-
-    context->base.textureFromPixmap = &__glXDRItextureFromPixmap;
-    /* Find the requested X visual */
-    visual = pScreen->visuals;
-    for (i = 0; i < pScreen->numVisuals; i++, visual++)
-        if (visual->vid == glxConfig->visualID)
-            break;
-    if (i == pScreen->numVisuals) {
-        free(context);
-        return NULL;
-    }
-
-    context->hwContextID = FakeClientID(0);
-
-    __glXenterServer(GL_FALSE);
-    retval = DRICreateContext(baseScreen->pScreen, visual,
-                              context->hwContextID, &hwContext);
-    __glXleaveServer(GL_FALSE);
-
-    if (!retval) {
-        free(context);
-        return NULL;
-    }
-
-    context->driContext = screen->legacy->createNewContext(screen->driScreen, config->driConfig, 0,     /* render type */
-                                                           driShare,
-                                                           hwContext, context);
-
-    if (context->driContext == NULL) {
-        __glXenterServer(GL_FALSE);
-        retval = DRIDestroyContext(baseScreen->pScreen, context->hwContextID);
-        __glXleaveServer(GL_FALSE);
-        free(context);
-        return NULL;
-    }
-
-    return &context->base;
-}
-
-static __GLXdrawable *
-__glXDRIscreenCreateDrawable(ClientPtr client,
-                             __GLXscreen * screen,
-                             DrawablePtr pDraw,
-                             XID drawId,
-                             int type, XID glxDrawId, __GLXconfig * glxConfig)
-{
-    __GLXDRIscreen *driScreen = (__GLXDRIscreen *) screen;
-    __GLXDRIconfig *config = (__GLXDRIconfig *) glxConfig;
-    __GLXDRIdrawable *private;
-    GLboolean retval;
-    drm_drawable_t hwDrawable;
-
-    private = calloc(1, sizeof *private);
-    if (private == NULL)
-        return NULL;
-
-    if (!__glXDrawableInit(&private->base, screen,
-                           pDraw, type, glxDrawId, glxConfig)) {
-        free(private);
-        return NULL;
-    }
-
-    private->base.destroy = __glXDRIdrawableDestroy;
-    private->base.swapBuffers = __glXDRIdrawableSwapBuffers;
-    private->base.copySubBuffer = __glXDRIdrawableCopySubBuffer;
-    private->base.waitX = NULL;
-    private->base.waitGL = NULL;
-
-    __glXenterServer(GL_FALSE);
-    retval = DRICreateDrawable(screen->pScreen, serverClient,
-                               pDraw, &hwDrawable);
-    __glXleaveServer(GL_FALSE);
-
-    if (!retval) {
-        free(private);
-        return NULL;
-    }
-
-    /* The last argument is 'attrs', which is used with pbuffers which
-     * we currently don't support. */
-
-    private->driDrawable =
-        (driScreen->legacy->createNewDrawable) (driScreen->driScreen,
-                                                config->driConfig,
-                                                hwDrawable, 0, NULL, private);
-
-    if (private->driDrawable == NULL) {
-        __glXenterServer(GL_FALSE);
-        DRIDestroyDrawable(screen->pScreen, serverClient, pDraw);
-        __glXleaveServer(GL_FALSE);
-        free(private);
-        return NULL;
-    }
-
-    return &private->base;
-}
-
-static GLboolean
-getDrawableInfo(__DRIdrawable * driDrawable,
-                unsigned int *index, unsigned int *stamp,
-                int *x, int *y, int *width, int *height,
-                int *numClipRects, drm_clip_rect_t ** ppClipRects,
-                int *backX, int *backY,
-                int *numBackClipRects, drm_clip_rect_t ** ppBackClipRects,
-                void *data)
-{
-    __GLXDRIdrawable *drawable = data;
-    ScreenPtr pScreen;
-    drm_clip_rect_t *pClipRects, *pBackClipRects;
-    GLboolean retval;
-    size_t size;
-
-    /* If the X window has been destroyed, give up here. */
-    if (drawable->base.pDraw == NULL)
-        return GL_FALSE;
-
-    pScreen = drawable->base.pDraw->pScreen;
-    __glXenterServer(GL_FALSE);
-    retval = DRIGetDrawableInfo(pScreen, drawable->base.pDraw, index, stamp,
-                                x, y, width, height,
-                                numClipRects, &pClipRects,
-                                backX, backY,
-                                numBackClipRects, &pBackClipRects);
-    __glXleaveServer(GL_FALSE);
-
-    if (retval && *numClipRects > 0) {
-        size = sizeof(drm_clip_rect_t) * *numClipRects;
-        *ppClipRects = malloc(size);
-
-        /* Clip cliprects to screen dimensions (redirected windows) */
-        if (*ppClipRects != NULL) {
-            int i, j;
-
-            for (i = 0, j = 0; i < *numClipRects; i++) {
-                (*ppClipRects)[j].x1 = max(pClipRects[i].x1, 0);
-                (*ppClipRects)[j].y1 = max(pClipRects[i].y1, 0);
-                (*ppClipRects)[j].x2 = min(pClipRects[i].x2, pScreen->width);
-                (*ppClipRects)[j].y2 = min(pClipRects[i].y2, pScreen->height);
-
-                if ((*ppClipRects)[j].x1 < (*ppClipRects)[j].x2 &&
-                    (*ppClipRects)[j].y1 < (*ppClipRects)[j].y2) {
-                    j++;
-                }
-            }
-
-            if (*numClipRects != j) {
-                *numClipRects = j;
-                *ppClipRects = realloc(*ppClipRects,
-                                       sizeof(drm_clip_rect_t) * *numClipRects);
-            }
-        }
-        else
-            *numClipRects = 0;
-    }
-    else {
-        *ppClipRects = NULL;
-        *numClipRects = 0;
-    }
-
-    if (retval && *numBackClipRects > 0) {
-        size = sizeof(drm_clip_rect_t) * *numBackClipRects;
-        *ppBackClipRects = malloc(size);
-        if (*ppBackClipRects != NULL)
-            memcpy(*ppBackClipRects, pBackClipRects, size);
-        else
-            *numBackClipRects = 0;
-    }
-    else {
-        *ppBackClipRects = NULL;
-        *numBackClipRects = 0;
-    }
-
-    return retval;
-}
-
-static void
-__glXReportDamage(__DRIdrawable * driDraw,
-                  int x, int y,
-                  drm_clip_rect_t * rects, int num_rects,
-                  GLboolean front_buffer, void *data)
-{
-    __GLXDRIdrawable *drawable = data;
-    DrawablePtr pDraw = drawable->base.pDraw;
-    RegionRec region;
-
-    __glXenterServer(GL_FALSE);
-
-    if (RegionInitBoxes(&region, (BoxPtr) rects, num_rects)) {
-        RegionTranslate(&region, pDraw->x, pDraw->y);
-        DamageDamageRegion(pDraw, &region);
-        RegionUninit(&region);
-    }
-    else {
-        while (num_rects--) {
-            RegionInit(&region, (BoxPtr) rects++, 1);
-            RegionTranslate(&region, pDraw->x, pDraw->y);
-            DamageDamageRegion(pDraw, &region);
-            RegionUninit(&region);
-        }
-    }
-
-    __glXleaveServer(GL_FALSE);
-}
-
-static const __DRIgetDrawableInfoExtension getDrawableInfoExtension = {
-    {__DRI_GET_DRAWABLE_INFO, __DRI_GET_DRAWABLE_INFO_VERSION},
-    getDrawableInfo
-};
-
-static const __DRIdamageExtension damageExtension = {
-    {__DRI_DAMAGE, __DRI_DAMAGE_VERSION},
-    __glXReportDamage,
-};
-
-static const __DRIextension *loader_extensions[] = {
-    &systemTimeExtension.base,
-    &getDrawableInfoExtension.base,
-    &damageExtension.base,
-    NULL
-};
-
-static Bool
-glxDRIEnterVT(ScrnInfoPtr scrn)
-{
-    Bool ret;
-    __GLXDRIscreen *screen = (__GLXDRIscreen *)
-        glxGetScreen(xf86ScrnToScreen(scrn));
-
-    LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
-
-    scrn->EnterVT = screen->enterVT;
-
-    ret = scrn->EnterVT(scrn);
-
-    screen->enterVT = scrn->EnterVT;
-    scrn->EnterVT = glxDRIEnterVT;
-
-    if (!ret)
-        return FALSE;
-
-    glxResumeClients();
-
-    return TRUE;
-}
-
-static void
-glxDRILeaveVT(ScrnInfoPtr scrn)
-{
-    __GLXDRIscreen *screen = (__GLXDRIscreen *)
-        glxGetScreen(xf86ScrnToScreen(scrn));
-
-    LogMessageVerbSigSafe(X_INFO, -1, "AIGLX: Suspending AIGLX clients for VT switch\n");
-
-    glxSuspendClients();
-
-    scrn->LeaveVT = screen->leaveVT;
-    (*screen->leaveVT) (scrn);
-    screen->leaveVT = scrn->LeaveVT;
-    scrn->LeaveVT = glxDRILeaveVT;
-}
-
-static void
-initializeExtensions(__GLXDRIscreen * screen)
-{
-    const __DRIextension **extensions;
-    int i;
-
-    extensions = screen->core->getExtensions(screen->driScreen);
-
-    for (i = 0; extensions[i]; i++) {
-#ifdef __DRI_READ_DRAWABLE
-        if (strcmp(extensions[i]->name, __DRI_READ_DRAWABLE) == 0) {
-            __glXEnableExtension(screen->glx_enable_bits,
-                                 "GLX_SGI_make_current_read");
-
-            LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_make_current_read\n");
-        }
-#endif
-
-#ifdef __DRI_COPY_SUB_BUFFER
-        if (strcmp(extensions[i]->name, __DRI_COPY_SUB_BUFFER) == 0) {
-            screen->copySubBuffer =
-                (__DRIcopySubBufferExtension *) extensions[i];
-            __glXEnableExtension(screen->glx_enable_bits,
-                                 "GLX_MESA_copy_sub_buffer");
-
-            LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");
-        }
-#endif
-
-#ifdef __DRI_SWAP_CONTROL
-        if (strcmp(extensions[i]->name, __DRI_SWAP_CONTROL) == 0) {
-            screen->swapControl = (__DRIswapControlExtension *) extensions[i];
-            __glXEnableExtension(screen->glx_enable_bits,
-                                 "GLX_SGI_swap_control");
-            __glXEnableExtension(screen->glx_enable_bits,
-                                 "GLX_MESA_swap_control");
-
-            LogMessage(X_INFO,
-                       "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");
-        }
-#endif
-
-#ifdef __DRI_TEX_OFFSET
-        if (strcmp(extensions[i]->name, __DRI_TEX_OFFSET) == 0) {
-            screen->texOffset = (__DRItexOffsetExtension *) extensions[i];
-            LogMessage(X_INFO,
-                       "AIGLX: enabled GLX_texture_from_pixmap with driver support\n");
-        }
-#endif
-        /* Ignore unknown extensions */
-    }
-}
-
-static __GLXscreen *
-__glXDRIscreenProbe(ScreenPtr pScreen)
-{
-    drm_handle_t hSAREA;
-    drmAddress pSAREA = NULL;
-    char *BusID;
-    __DRIversion ddx_version;
-    __DRIversion dri_version;
-    __DRIversion drm_version;
-    __DRIframebuffer framebuffer;
-    int fd = -1;
-    int status;
-    drm_magic_t magic;
-    drmVersionPtr version;
-    int newlyopened;
-    char *driverName;
-    drm_handle_t hFB;
-    int junk;
-    __GLXDRIscreen *screen;
-    Bool isCapable;
-    size_t buffer_size;
-    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-
-    framebuffer.base = NULL;
-
-    if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
-        !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) {
-        LogMessage(X_INFO,
-                   "AIGLX: Screen %d is not DRI capable\n", pScreen->myNum);
-        return NULL;
-    }
-
-    screen = calloc(1, sizeof *screen);
-    if (screen == NULL)
-        return NULL;
-
-    screen->base.destroy = __glXDRIscreenDestroy;
-    screen->base.createContext = __glXDRIscreenCreateContext;
-    screen->base.createDrawable = __glXDRIscreenCreateDrawable;
-    screen->base.swapInterval = __glXDRIdrawableSwapInterval;
-    screen->base.pScreen = pScreen;
-
-    __glXInitExtensionEnableBits(screen->glx_enable_bits);
-
-    /* DRI protocol version. */
-    dri_version.major = XF86DRI_MAJOR_VERSION;
-    dri_version.minor = XF86DRI_MINOR_VERSION;
-    dri_version.patch = XF86DRI_PATCH_VERSION;
-
-    if (!DRIOpenConnection(pScreen, &hSAREA, &BusID)) {
-        LogMessage(X_ERROR, "AIGLX error: DRIOpenConnection failed\n");
-        goto handle_error;
-    }
-
-    fd = drmOpenOnce(NULL, BusID, &newlyopened);
-
-    if (fd < 0) {
-        LogMessage(X_ERROR, "AIGLX error: drmOpenOnce failed (%s)\n",
-                   strerror(-fd));
-        goto handle_error;
-    }
-
-    if (drmGetMagic(fd, &magic)) {
-        LogMessage(X_ERROR, "AIGLX error: drmGetMagic failed\n");
-        goto handle_error;
-    }
-
-    version = drmGetVersion(fd);
-    if (version) {
-        drm_version.major = version->version_major;
-        drm_version.minor = version->version_minor;
-        drm_version.patch = version->version_patchlevel;
-        drmFreeVersion(version);
-    }
-    else {
-        drm_version.major = -1;
-        drm_version.minor = -1;
-        drm_version.patch = -1;
-    }
-
-    if (newlyopened && !DRIAuthConnection(pScreen, magic)) {
-        LogMessage(X_ERROR, "AIGLX error: DRIAuthConnection failed\n");
-        goto handle_error;
-    }
-
-    /* Get device name (like "tdfx") and the ddx version numbers.
-     * We'll check the version in each DRI driver's "createNewScreen"
-     * function. */
-    if (!DRIGetClientDriverName(pScreen,
-                                &ddx_version.major,
-                                &ddx_version.minor,
-                                &ddx_version.patch, &driverName)) {
-        LogMessage(X_ERROR, "AIGLX error: DRIGetClientDriverName failed\n");
-        goto handle_error;
-    }
-
-    screen->driver = glxProbeDriver(driverName,
-                                    (void **) &screen->core,
-                                    __DRI_CORE, __DRI_CORE_VERSION,
-                                    (void **) &screen->legacy,
-                                    __DRI_LEGACY, __DRI_LEGACY_VERSION);
-    if (screen->driver == NULL) {
-        goto handle_error;
-    }
-
-    /*
-     * Get device-specific info.  pDevPriv will point to a struct
-     * (such as DRIRADEONRec in xfree86/driver/ati/radeon_dri.h) that
-     * has information about the screen size, depth, pitch, ancilliary
-     * buffers, DRM mmap handles, etc.
-     */
-    if (!DRIGetDeviceInfo(pScreen, &hFB, &junk,
-                          &framebuffer.size, &framebuffer.stride,
-                          &framebuffer.dev_priv_size, &framebuffer.dev_priv)) {
-        LogMessage(X_ERROR, "AIGLX error: XF86DRIGetDeviceInfo failed\n");
-        goto handle_error;
-    }
-
-    framebuffer.width = pScreen->width;
-    framebuffer.height = pScreen->height;
-
-    /* Map the framebuffer region. */
-    status = drmMap(fd, hFB, framebuffer.size,
-                    (drmAddressPtr) &framebuffer.base);
-    if (status != 0) {
-        LogMessage(X_ERROR, "AIGLX error: drmMap of framebuffer failed (%s)\n",
-                   strerror(-status));
-        goto handle_error;
-    }
-
-    /* Map the SAREA region.  Further mmap regions may be setup in
-     * each DRI driver's "createNewScreen" function.
-     */
-    status = drmMap(fd, hSAREA, SAREA_MAX, &pSAREA);
-    if (status != 0) {
-        LogMessage(X_ERROR, "AIGLX error: drmMap of SAREA failed (%s)\n",
-                   strerror(-status));
-        goto handle_error;
-    }
-
-    screen->driScreen =
-        (*screen->legacy->createNewScreen) (pScreen->myNum,
-                                            &ddx_version,
-                                            &dri_version,
-                                            &drm_version,
-                                            &framebuffer,
-                                            pSAREA,
-                                            fd,
-                                            loader_extensions,
-                                            &screen->driConfigs, screen);
-
-    if (screen->driScreen == NULL) {
-        LogMessage(X_ERROR, "AIGLX error: Calling driver entry point failed\n");
-        goto handle_error;
-    }
-
-    screen->base.fbconfigs = glxConvertConfigs(screen->core,
-                                               screen->driConfigs,
-                                               GLX_WINDOW_BIT);
-
-    initializeExtensions(screen);
-
-    DRIGetTexOffsetFuncs(pScreen, &screen->texOffsetStart,
-                         &screen->texOffsetFinish);
-
-    __glXScreenInit(&screen->base, pScreen);
-
-    /* The first call simply determines the length of the extension string.
-     * This allows us to allocate some memory to hold the extension string,
-     * but it requires that we call __glXGetExtensionString a second time.
-     */
-    buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);
-    if (buffer_size > 0) {
-        free(screen->base.GLXextensions);
-
-        screen->base.GLXextensions = xnfalloc(buffer_size);
-        (void) __glXGetExtensionString(screen->glx_enable_bits,
-                                       screen->base.GLXextensions);
-    }
-
-    __glXsetEnterLeaveServerFuncs(__glXDRIenterServer, __glXDRIleaveServer);
-
-    screen->enterVT = pScrn->EnterVT;
-    pScrn->EnterVT = glxDRIEnterVT;
-    screen->leaveVT = pScrn->LeaveVT;
-    pScrn->LeaveVT = glxDRILeaveVT;
-
-    LogMessage(X_INFO, "AIGLX: Loaded and initialized %s\n", driverName);
-
-    return &screen->base;
-
- handle_error:
-    if (pSAREA != NULL)
-        drmUnmap(pSAREA, SAREA_MAX);
-
-    if (framebuffer.base != NULL)
-        drmUnmap((drmAddress) framebuffer.base, framebuffer.size);
-
-    if (fd >= 0)
-        drmCloseOnce(fd);
-
-    DRICloseConnection(pScreen);
-
-    if (screen->driver)
-        dlclose(screen->driver);
-
-    free(screen);
-
-    LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
-
-    return NULL;
-}
-
-_X_EXPORT __GLXprovider __glXDRIProvider = {
-    __glXDRIscreenProbe,
-    "DRI",
-    NULL
-};
diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c
index f662b2188..1d74c8f5a 100644
--- a/xorg-server/glx/glxdri2.c
+++ b/xorg-server/glx/glxdri2.c
@@ -49,10 +49,6 @@
 #include "glxdricommon.h"
 #include <GL/glxtokens.h>
 
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 #include "extension_string.h"
 
 typedef struct __GLXDRIscreen __GLXDRIscreen;
@@ -845,6 +841,11 @@ glxDRILeaveVT(ScrnInfoPtr scrn)
     scrn->LeaveVT = glxDRILeaveVT;
 }
 
+/**
+ * Initialize extension flags in glx_enable_bits when a new screen is created
+ *
+ * @param screen The screen where glx_enable_bits are to be set.
+ */
 static void
 initializeExtensions(__GLXDRIscreen * screen)
 {
@@ -889,6 +890,12 @@ initializeExtensions(__GLXDRIscreen * screen)
         LogMessage(X_INFO, "AIGLX: enabled GLX_EXT_framebuffer_sRGB\n");
     }
 
+    /* enable ARB_fbconfig_float extension (even if there are no float fbconfigs) */
+    {
+        __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_fbconfig_float");
+        LogMessage(X_INFO, "AIGLX: enabled GLX_ARB_fbconfig_float\n");
+    }
+
     for (i = 0; extensions[i]; i++) {
 #ifdef __DRI_READ_DRAWABLE
         if (strcmp(extensions[i]->name, __DRI_READ_DRAWABLE) == 0) {
diff --git a/xorg-server/glx/glxdricommon.c b/xorg-server/glx/glxdricommon.c
index 0ab3e3071..48f0bce21 100644
--- a/xorg-server/glx/glxdricommon.c
+++ b/xorg-server/glx/glxdricommon.c
@@ -36,6 +36,7 @@
 #include <GL/internal/dri_interface.h>
 #include <os.h>
 #include "glxserver.h"
+#include "glxext.h"
 #include "glxcontext.h"
 #include "glxscreens.h"
 #include "glxdricommon.h"
@@ -127,6 +128,7 @@ createModeFromConfig(const __DRIcoreExtension * core,
                      unsigned int visualType, unsigned int drawableType)
 {
     __GLXDRIconfig *config;
+    GLint renderType = 0;
     unsigned int attrib, value;
     int i;
 
@@ -138,11 +140,14 @@ createModeFromConfig(const __DRIcoreExtension * core,
     while (core->indexConfigAttrib(driConfig, i++, &attrib, &value)) {
         switch (attrib) {
         case __DRI_ATTRIB_RENDER_TYPE:
-            config->config.renderType = 0;
             if (value & __DRI_ATTRIB_RGBA_BIT)
-                config->config.renderType |= GLX_RGBA_BIT;
+                renderType |= GLX_RGBA_BIT;
             if (value & __DRI_ATTRIB_COLOR_INDEX_BIT)
-                config->config.renderType |= GLX_COLOR_INDEX_BIT;
+                renderType |= GLX_COLOR_INDEX_BIT;
+            if (value & __DRI_ATTRIB_FLOAT_BIT)
+                renderType |= GLX_RGBA_FLOAT_BIT_ARB;
+            if (value & __DRI_ATTRIB_UNSIGNED_FLOAT_BIT)
+                renderType |= GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT;
             break;
         case __DRI_ATTRIB_CONFIG_CAVEAT:
             if (value & __DRI_ATTRIB_NON_CONFORMANT_CONFIG)
@@ -171,11 +176,26 @@ createModeFromConfig(const __DRIcoreExtension * core,
     config->config.next = NULL;
     config->config.xRenderable = GL_TRUE;
     config->config.visualType = visualType;
+    config->config.renderType = renderType;
     config->config.drawableType = drawableType;
 
     return &config->config;
 }
 
+static Bool
+render_type_is_pbuffer_only(unsigned renderType)
+{
+    /* The GL_ARB_color_buffer_float spec says:
+     *
+     *     "Note that floating point rendering is only supported for
+     *     GLXPbuffer drawables.  The GLX_DRAWABLE_TYPE attribute of the
+     *     GLXFBConfig must have the GLX_PBUFFER_BIT bit set and the
+     *     GLX_RENDER_TYPE attribute must have the GLX_RGBA_FLOAT_BIT set."
+     */
+    return !!(renderType & (__DRI_ATTRIB_UNSIGNED_FLOAT_BIT
+                            | __DRI_ATTRIB_FLOAT_BIT));
+}
+
 __GLXconfig *
 glxConvertConfigs(const __DRIcoreExtension * core,
                   const __DRIconfig ** configs, unsigned int drawableType)
@@ -187,6 +207,14 @@ glxConvertConfigs(const __DRIcoreExtension * core,
     head.next = NULL;
 
     for (i = 0; configs[i]; i++) {
+        unsigned renderType = 0;
+        if (core->getConfigAttrib(configs[i], __DRI_ATTRIB_RENDER_TYPE,
+                                  &renderType)) {
+            if (render_type_is_pbuffer_only(renderType) &&
+                !(drawableType & GLX_PBUFFER_BIT))
+                continue;
+        }
+        /* Add all the others */
         tail->next = createModeFromConfig(core,
                                           configs[i], GLX_TRUE_COLOR,
                                           drawableType);
@@ -197,6 +225,14 @@ glxConvertConfigs(const __DRIcoreExtension * core,
     }
 
     for (i = 0; configs[i]; i++) {
+        int renderType = 0;
+        if (core->getConfigAttrib(configs[i], __DRI_ATTRIB_RENDER_TYPE,
+                                  &renderType)) {
+            if (render_type_is_pbuffer_only(renderType) &&
+                !(drawableType & GLX_PBUFFER_BIT))
+                continue;
+        }
+        /* Add all the others */
         tail->next = createModeFromConfig(core,
                                           configs[i], GLX_DIRECT_COLOR,
                                           drawableType);
diff --git a/xorg-server/glx/glxdriswrast.c b/xorg-server/glx/glxdriswrast.c
index b47839868..c9962dc81 100644
--- a/xorg-server/glx/glxdriswrast.c
+++ b/xorg-server/glx/glxdriswrast.c
@@ -48,10 +48,6 @@
 #include "glxutil.h"
 #include "glxdricommon.h"
 
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 #include "extension_string.h"
 
 /* RTLD_LOCAL is not defined on Cygwin */
diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c
index 2c3f5edf0..3a7de28fb 100644
--- a/xorg-server/glx/glxext.c
+++ b/xorg-server/glx/glxext.c
@@ -95,16 +95,15 @@ __glXResetLargeCommandStatus(__GLXclientState * cl)
 }
 
 /*
-** This procedure is called when the client who created the context goes
-** away OR when glXDestroyContext is called.  In either case, all we do is
-** flag that the ID is no longer valid, and (maybe) free the context.
-** use.
-*/
+ * This procedure is called when the client who created the context goes away
+ * OR when glXDestroyContext is called.  In either case, all we do is flag that
+ * the ID is no longer valid, and (maybe) free the context.
+ */
 static int
 ContextGone(__GLXcontext * cx, XID id)
 {
     cx->idExists = GL_FALSE;
-    if (!cx->isCurrent) {
+    if (!cx->currentClient) {
         __glXFreeContext(cx);
     }
 
@@ -138,9 +137,10 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid)
 
     for (c = glxAllContexts; c; c = next) {
         next = c->next;
-        if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
+        if (c->currentClient &&
+		(c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
+            /* just force a re-bind the next time through */
             (*c->loseCurrent) (c);
-            c->isCurrent = GL_FALSE;
             if (c == __glXLastContext)
                 __glXFlushContextCache();
         }
@@ -196,17 +196,17 @@ __glXRemoveFromContextList(__GLXcontext * cx)
 GLboolean
 __glXFreeContext(__GLXcontext * cx)
 {
-    if (cx->idExists || cx->isCurrent)
+    if (cx->idExists || cx->currentClient)
         return GL_FALSE;
 
+    __glXRemoveFromContextList(cx);
+
     free(cx->feedbackBuf);
     free(cx->selectBuf);
     if (cx == __glXLastContext) {
         __glXFlushContextCache();
     }
 
-    __glXRemoveFromContextList(cx);
-
     /* We can get here through both regular dispatching from
      * __glXDispatch() or as a callback from the resource manager.  In
      * the latter case we need to lift the DRI lock manually. */
@@ -283,6 +283,7 @@ glxClientCallback(CallbackListPtr *list, pointer closure, pointer data)
     NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
     ClientPtr pClient = clientinfo->client;
     __GLXclientState *cl = glxGetClient(pClient);
+    __GLXcontext *c, *next;
 
     switch (pClient->clientState) {
     case ClientStateRunning:
@@ -290,6 +291,16 @@ glxClientCallback(CallbackListPtr *list, pointer closure, pointer data)
         break;
 
     case ClientStateGone:
+        /* detach from all current contexts */
+        for (c = glxAllContexts; c; c = next) {
+            next = c->next;
+            if (c->currentClient == pClient) {
+                c->loseCurrent(c);
+                c->currentClient = NULL;
+                __glXFreeContext(c);
+            }
+        }
+
         free(cl->returnBuf);
         free(cl->largeCmdBuf);
         free(cl->GLClientextensions);
@@ -530,6 +541,19 @@ __glXleaveServer(GLboolean rendering)
     glxServerLeaveCount++;
 }
 
+static void (*(*_get_proc_address)(const char *))(void);
+
+void
+__glXsetGetProcAddress(void (*(*get_proc_address) (const char *))(void))
+{
+    _get_proc_address = get_proc_address;
+}
+
+void *__glGetProcAddress(const char *proc)
+{
+    return _get_proc_address(proc);
+}
+
 /*
 ** Top level dispatcher; all commands are executed from here down.
 */
diff --git a/xorg-server/glx/glxext.h b/xorg-server/glx/glxext.h
index 9b0978b93..3f2dee696 100644
--- a/xorg-server/glx/glxext.h
+++ b/xorg-server/glx/glxext.h
@@ -35,6 +35,22 @@
  * Silicon Graphics, Inc.
  */
 
+/* doing #include <GL/glx.h> & #include <GL/glxext.h> could cause problems
+ * with overlapping definitions, so let's use the easy way
+ */
+#ifndef GLX_RGBA_FLOAT_BIT_ARB
+#define GLX_RGBA_FLOAT_BIT_ARB             0x00000004
+#endif
+#ifndef GLX_RGBA_FLOAT_TYPE_ARB
+#define GLX_RGBA_FLOAT_TYPE_ARB            0x20B9
+#endif
+#ifndef GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT
+#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT    0x00000008
+#endif
+#ifndef GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT
+#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT   0x20B1
+#endif
+
 extern GLboolean __glXFreeContext(__GLXcontext * glxc);
 extern void __glXFlushContextCache(void);
 
diff --git a/xorg-server/glx/glxserver.h b/xorg-server/glx/glxserver.h
index 1021aec80..5e29abb28 100644
--- a/xorg-server/glx/glxserver.h
+++ b/xorg-server/glx/glxserver.h
@@ -46,7 +46,9 @@
 #include <resource.h>
 #include <scrnintstr.h>
 
+#define GL_GLEXT_PROTOTYPES     /* we want prototypes */
 #include <GL/gl.h>
+#include <GL/glext.h>
 #include <GL/glxproto.h>
 
 /*
@@ -115,6 +117,9 @@ void __glXleaveServer(GLboolean rendering);
 void glxSuspendClients(void);
 void glxResumeClients(void);
 
+void __glXsetGetProcAddress(void (*(*get_proc_address) (const char *)) (void));
+void *__glGetProcAddress(const char *);
+
 /*
 ** State kept per client.
 */
diff --git a/xorg-server/glx/glxstubs.c b/xorg-server/glx/glxstubs.c
new file mode 100644
index 000000000..69bc00480
--- /dev/null
+++ b/xorg-server/glx/glxstubs.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2013 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *	Adam Jackson <ajax@redhat.com>
+ */
+
+/*
+ * Redirection stubs for things that we call by name but that aren't exported
+ * from libGL by name.  Strictly speaking this list should be a lot longer,
+ * but this is enough to get us linking against contemporary Mesa.
+ */
+
+#include <inttypes.h>
+#include "glxserver.h"
+
+#define thunk(name, type, call_args, ...) \
+    _X_HIDDEN void name(__VA_ARGS__) { \
+	static type proc; \
+	if (!proc) proc = __glGetProcAddress(#name); \
+	proc call_args; \
+    }
+
+thunk(glSampleMaskSGIS, PFNGLSAMPLEMASKSGISPROC,
+      (value, invert), GLclampf value, GLboolean invert)
+
+thunk(glSamplePatternSGIS, PFNGLSAMPLEPATTERNSGISPROC,
+      (pattern), GLenum pattern)
+
+thunk(glActiveStencilFaceEXT, PFNGLACTIVESTENCILFACEEXTPROC,
+      (face), GLenum face)
diff --git a/xorg-server/glx/indirect_dispatch.c b/xorg-server/glx/indirect_dispatch.c
index 0a7623cf2..1eee79a52 100644
--- a/xorg-server/glx/indirect_dispatch.c
+++ b/xorg-server/glx/indirect_dispatch.c
@@ -25,21 +25,14 @@
  * SOFTWARE.
  */
 
-#include <X11/Xmd.h>
-#include <GL/gl.h>
-#include <GL/glxproto.h>
 #include <inttypes.h>
+#include "glxserver.h"
 #include "indirect_size.h"
 #include "indirect_size_get.h"
 #include "indirect_dispatch.h"
-#include "glxserver.h"
 #include "glxbyteorder.h"
 #include "indirect_util.h"
 #include "singlesize.h"
-#include "glapi.h"
-#include "glapitable.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 #define __GLX_PAD(x)  (((x) + 3) & ~3)
 
@@ -61,8 +54,7 @@ __glXDisp_NewList(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        CALL_NewList(GET_DISPATCH(), (*(GLuint *) (pc + 0), *(GLenum *) (pc + 4)
-                     ));
+        glNewList(*(GLuint *) (pc + 0), *(GLenum *) (pc + 4));
         error = Success;
     }
 
@@ -78,7 +70,7 @@ __glXDisp_EndList(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        CALL_EndList(GET_DISPATCH(), ());
+        glEndList();
         error = Success;
     }
 
@@ -88,8 +80,7 @@ __glXDisp_EndList(__GLXclientState * cl, GLbyte * pc)
 void
 __glXDisp_CallList(GLbyte * pc)
 {
-    CALL_CallList(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                  ));
+    glCallList(*(GLuint *) (pc + 0));
 }
 
 void
@@ -101,7 +92,7 @@ __glXDisp_CallLists(GLbyte * pc)
 
     lists = (const GLvoid *) (pc + 8);
 
-    CALL_CallLists(GET_DISPATCH(), (n, type, lists));
+    glCallLists(n, type, lists);
 }
 
 int
@@ -113,9 +104,7 @@ __glXDisp_DeleteLists(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        CALL_DeleteLists(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                          *(GLsizei *) (pc + 4)
-                         ));
+        glDeleteLists(*(GLuint *) (pc + 0), *(GLsizei *) (pc + 4));
         error = Success;
     }
 
@@ -133,8 +122,7 @@ __glXDisp_GenLists(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLuint retval;
 
-        retval = CALL_GenLists(GET_DISPATCH(), (*(GLsizei *) (pc + 0)
-                               ));
+        retval = glGenLists(*(GLsizei *) (pc + 0));
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -145,15 +133,13 @@ __glXDisp_GenLists(__GLXclientState * cl, GLbyte * pc)
 void
 __glXDisp_ListBase(GLbyte * pc)
 {
-    CALL_ListBase(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                  ));
+    glListBase(*(GLuint *) (pc + 0));
 }
 
 void
 __glXDisp_Begin(GLbyte * pc)
 {
-    CALL_Begin(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-               ));
+    glBegin(*(GLenum *) (pc + 0));
 }
 
 void
@@ -162,29 +148,23 @@ __glXDisp_Bitmap(GLbyte * pc)
     const GLubyte *const bitmap = (const GLubyte *) ((pc + 44));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    CALL_Bitmap(GET_DISPATCH(), (*(GLsizei *) (pc + 20),
-                                 *(GLsizei *) (pc + 24),
-                                 *(GLfloat *) (pc + 28),
-                                 *(GLfloat *) (pc + 32),
-                                 *(GLfloat *) (pc + 36),
-                                 *(GLfloat *) (pc + 40), bitmap));
+    glBitmap(*(GLsizei *) (pc + 20),
+             *(GLsizei *) (pc + 24),
+             *(GLfloat *) (pc + 28),
+             *(GLfloat *) (pc + 32),
+             *(GLfloat *) (pc + 36), *(GLfloat *) (pc + 40), bitmap);
 }
 
 void
 __glXDisp_Color3bv(GLbyte * pc)
 {
-    CALL_Color3bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                  ));
+    glColor3bv((const GLbyte *) (pc + 0));
 }
 
 void
@@ -197,57 +177,49 @@ __glXDisp_Color3dv(GLbyte * pc)
     }
 #endif
 
-    CALL_Color3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                  ));
+    glColor3dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_Color3fv(GLbyte * pc)
 {
-    CALL_Color3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                  ));
+    glColor3fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_Color3iv(GLbyte * pc)
 {
-    CALL_Color3iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                  ));
+    glColor3iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_Color3sv(GLbyte * pc)
 {
-    CALL_Color3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                  ));
+    glColor3sv((const GLshort *) (pc + 0));
 }
 
 void
 __glXDisp_Color3ubv(GLbyte * pc)
 {
-    CALL_Color3ubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                   ));
+    glColor3ubv((const GLubyte *) (pc + 0));
 }
 
 void
 __glXDisp_Color3uiv(GLbyte * pc)
 {
-    CALL_Color3uiv(GET_DISPATCH(), ((const GLuint *) (pc + 0)
-                   ));
+    glColor3uiv((const GLuint *) (pc + 0));
 }
 
 void
 __glXDisp_Color3usv(GLbyte * pc)
 {
-    CALL_Color3usv(GET_DISPATCH(), ((const GLushort *) (pc + 0)
-                   ));
+    glColor3usv((const GLushort *) (pc + 0));
 }
 
 void
 __glXDisp_Color4bv(GLbyte * pc)
 {
-    CALL_Color4bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                  ));
+    glColor4bv((const GLbyte *) (pc + 0));
 }
 
 void
@@ -260,63 +232,55 @@ __glXDisp_Color4dv(GLbyte * pc)
     }
 #endif
 
-    CALL_Color4dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                  ));
+    glColor4dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_Color4fv(GLbyte * pc)
 {
-    CALL_Color4fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                  ));
+    glColor4fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_Color4iv(GLbyte * pc)
 {
-    CALL_Color4iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                  ));
+    glColor4iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_Color4sv(GLbyte * pc)
 {
-    CALL_Color4sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                  ));
+    glColor4sv((const GLshort *) (pc + 0));
 }
 
 void
 __glXDisp_Color4ubv(GLbyte * pc)
 {
-    CALL_Color4ubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                   ));
+    glColor4ubv((const GLubyte *) (pc + 0));
 }
 
 void
 __glXDisp_Color4uiv(GLbyte * pc)
 {
-    CALL_Color4uiv(GET_DISPATCH(), ((const GLuint *) (pc + 0)
-                   ));
+    glColor4uiv((const GLuint *) (pc + 0));
 }
 
 void
 __glXDisp_Color4usv(GLbyte * pc)
 {
-    CALL_Color4usv(GET_DISPATCH(), ((const GLushort *) (pc + 0)
-                   ));
+    glColor4usv((const GLushort *) (pc + 0));
 }
 
 void
 __glXDisp_EdgeFlagv(GLbyte * pc)
 {
-    CALL_EdgeFlagv(GET_DISPATCH(), ((const GLboolean *) (pc + 0)
-                   ));
+    glEdgeFlagv((const GLboolean *) (pc + 0));
 }
 
 void
 __glXDisp_End(GLbyte * pc)
 {
-    CALL_End(GET_DISPATCH(), ());
+    glEnd();
 }
 
 void
@@ -329,36 +293,31 @@ __glXDisp_Indexdv(GLbyte * pc)
     }
 #endif
 
-    CALL_Indexdv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                 ));
+    glIndexdv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_Indexfv(GLbyte * pc)
 {
-    CALL_Indexfv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                 ));
+    glIndexfv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_Indexiv(GLbyte * pc)
 {
-    CALL_Indexiv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                 ));
+    glIndexiv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_Indexsv(GLbyte * pc)
 {
-    CALL_Indexsv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                 ));
+    glIndexsv((const GLshort *) (pc + 0));
 }
 
 void
 __glXDisp_Normal3bv(GLbyte * pc)
 {
-    CALL_Normal3bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                   ));
+    glNormal3bv((const GLbyte *) (pc + 0));
 }
 
 void
@@ -371,29 +330,25 @@ __glXDisp_Normal3dv(GLbyte * pc)
     }
 #endif
 
-    CALL_Normal3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                   ));
+    glNormal3dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_Normal3fv(GLbyte * pc)
 {
-    CALL_Normal3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                   ));
+    glNormal3fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_Normal3iv(GLbyte * pc)
 {
-    CALL_Normal3iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                   ));
+    glNormal3iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_Normal3sv(GLbyte * pc)
 {
-    CALL_Normal3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                   ));
+    glNormal3sv((const GLshort *) (pc + 0));
 }
 
 void
@@ -406,29 +361,25 @@ __glXDisp_RasterPos2dv(GLbyte * pc)
     }
 #endif
 
-    CALL_RasterPos2dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                      ));
+    glRasterPos2dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_RasterPos2fv(GLbyte * pc)
 {
-    CALL_RasterPos2fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                      ));
+    glRasterPos2fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_RasterPos2iv(GLbyte * pc)
 {
-    CALL_RasterPos2iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                      ));
+    glRasterPos2iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_RasterPos2sv(GLbyte * pc)
 {
-    CALL_RasterPos2sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                      ));
+    glRasterPos2sv((const GLshort *) (pc + 0));
 }
 
 void
@@ -441,29 +392,25 @@ __glXDisp_RasterPos3dv(GLbyte * pc)
     }
 #endif
 
-    CALL_RasterPos3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                      ));
+    glRasterPos3dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_RasterPos3fv(GLbyte * pc)
 {
-    CALL_RasterPos3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                      ));
+    glRasterPos3fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_RasterPos3iv(GLbyte * pc)
 {
-    CALL_RasterPos3iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                      ));
+    glRasterPos3iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_RasterPos3sv(GLbyte * pc)
 {
-    CALL_RasterPos3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                      ));
+    glRasterPos3sv((const GLshort *) (pc + 0));
 }
 
 void
@@ -476,29 +423,25 @@ __glXDisp_RasterPos4dv(GLbyte * pc)
     }
 #endif
 
-    CALL_RasterPos4dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                      ));
+    glRasterPos4dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_RasterPos4fv(GLbyte * pc)
 {
-    CALL_RasterPos4fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                      ));
+    glRasterPos4fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_RasterPos4iv(GLbyte * pc)
 {
-    CALL_RasterPos4iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                      ));
+    glRasterPos4iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_RasterPos4sv(GLbyte * pc)
 {
-    CALL_RasterPos4sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                      ));
+    glRasterPos4sv((const GLshort *) (pc + 0));
 }
 
 void
@@ -511,33 +454,25 @@ __glXDisp_Rectdv(GLbyte * pc)
     }
 #endif
 
-    CALL_Rectdv(GET_DISPATCH(), ((const GLdouble *) (pc + 0),
-                                 (const GLdouble *) (pc + 16)
-                ));
+    glRectdv((const GLdouble *) (pc + 0), (const GLdouble *) (pc + 16));
 }
 
 void
 __glXDisp_Rectfv(GLbyte * pc)
 {
-    CALL_Rectfv(GET_DISPATCH(), ((const GLfloat *) (pc + 0),
-                                 (const GLfloat *) (pc + 8)
-                ));
+    glRectfv((const GLfloat *) (pc + 0), (const GLfloat *) (pc + 8));
 }
 
 void
 __glXDisp_Rectiv(GLbyte * pc)
 {
-    CALL_Rectiv(GET_DISPATCH(), ((const GLint *) (pc + 0),
-                                 (const GLint *) (pc + 8)
-                ));
+    glRectiv((const GLint *) (pc + 0), (const GLint *) (pc + 8));
 }
 
 void
 __glXDisp_Rectsv(GLbyte * pc)
 {
-    CALL_Rectsv(GET_DISPATCH(), ((const GLshort *) (pc + 0),
-                                 (const GLshort *) (pc + 4)
-                ));
+    glRectsv((const GLshort *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
@@ -550,29 +485,25 @@ __glXDisp_TexCoord1dv(GLbyte * pc)
     }
 #endif
 
-    CALL_TexCoord1dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                     ));
+    glTexCoord1dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_TexCoord1fv(GLbyte * pc)
 {
-    CALL_TexCoord1fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                     ));
+    glTexCoord1fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_TexCoord1iv(GLbyte * pc)
 {
-    CALL_TexCoord1iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                     ));
+    glTexCoord1iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_TexCoord1sv(GLbyte * pc)
 {
-    CALL_TexCoord1sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                     ));
+    glTexCoord1sv((const GLshort *) (pc + 0));
 }
 
 void
@@ -585,29 +516,25 @@ __glXDisp_TexCoord2dv(GLbyte * pc)
     }
 #endif
 
-    CALL_TexCoord2dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                     ));
+    glTexCoord2dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_TexCoord2fv(GLbyte * pc)
 {
-    CALL_TexCoord2fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                     ));
+    glTexCoord2fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_TexCoord2iv(GLbyte * pc)
 {
-    CALL_TexCoord2iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                     ));
+    glTexCoord2iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_TexCoord2sv(GLbyte * pc)
 {
-    CALL_TexCoord2sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                     ));
+    glTexCoord2sv((const GLshort *) (pc + 0));
 }
 
 void
@@ -620,29 +547,25 @@ __glXDisp_TexCoord3dv(GLbyte * pc)
     }
 #endif
 
-    CALL_TexCoord3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                     ));
+    glTexCoord3dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_TexCoord3fv(GLbyte * pc)
 {
-    CALL_TexCoord3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                     ));
+    glTexCoord3fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_TexCoord3iv(GLbyte * pc)
 {
-    CALL_TexCoord3iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                     ));
+    glTexCoord3iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_TexCoord3sv(GLbyte * pc)
 {
-    CALL_TexCoord3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                     ));
+    glTexCoord3sv((const GLshort *) (pc + 0));
 }
 
 void
@@ -655,29 +578,25 @@ __glXDisp_TexCoord4dv(GLbyte * pc)
     }
 #endif
 
-    CALL_TexCoord4dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                     ));
+    glTexCoord4dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_TexCoord4fv(GLbyte * pc)
 {
-    CALL_TexCoord4fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                     ));
+    glTexCoord4fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_TexCoord4iv(GLbyte * pc)
 {
-    CALL_TexCoord4iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                     ));
+    glTexCoord4iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_TexCoord4sv(GLbyte * pc)
 {
-    CALL_TexCoord4sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                     ));
+    glTexCoord4sv((const GLshort *) (pc + 0));
 }
 
 void
@@ -690,29 +609,25 @@ __glXDisp_Vertex2dv(GLbyte * pc)
     }
 #endif
 
-    CALL_Vertex2dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                   ));
+    glVertex2dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_Vertex2fv(GLbyte * pc)
 {
-    CALL_Vertex2fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                   ));
+    glVertex2fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_Vertex2iv(GLbyte * pc)
 {
-    CALL_Vertex2iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                   ));
+    glVertex2iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_Vertex2sv(GLbyte * pc)
 {
-    CALL_Vertex2sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                   ));
+    glVertex2sv((const GLshort *) (pc + 0));
 }
 
 void
@@ -725,29 +640,25 @@ __glXDisp_Vertex3dv(GLbyte * pc)
     }
 #endif
 
-    CALL_Vertex3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                   ));
+    glVertex3dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_Vertex3fv(GLbyte * pc)
 {
-    CALL_Vertex3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                   ));
+    glVertex3fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_Vertex3iv(GLbyte * pc)
 {
-    CALL_Vertex3iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                   ));
+    glVertex3iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_Vertex3sv(GLbyte * pc)
 {
-    CALL_Vertex3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                   ));
+    glVertex3sv((const GLshort *) (pc + 0));
 }
 
 void
@@ -760,29 +671,25 @@ __glXDisp_Vertex4dv(GLbyte * pc)
     }
 #endif
 
-    CALL_Vertex4dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                   ));
+    glVertex4dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_Vertex4fv(GLbyte * pc)
 {
-    CALL_Vertex4fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                   ));
+    glVertex4fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_Vertex4iv(GLbyte * pc)
 {
-    CALL_Vertex4iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                   ));
+    glVertex4iv((const GLint *) (pc + 0));
 }
 
 void
 __glXDisp_Vertex4sv(GLbyte * pc)
 {
-    CALL_Vertex4sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                   ));
+    glVertex4sv((const GLshort *) (pc + 0));
 }
 
 void
@@ -795,31 +702,25 @@ __glXDisp_ClipPlane(GLbyte * pc)
     }
 #endif
 
-    CALL_ClipPlane(GET_DISPATCH(), (*(GLenum *) (pc + 32),
-                                    (const GLdouble *) (pc + 0)
-                   ));
+    glClipPlane(*(GLenum *) (pc + 32), (const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_ColorMaterial(GLbyte * pc)
 {
-    CALL_ColorMaterial(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLenum *) (pc + 4)
-                       ));
+    glColorMaterial(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4));
 }
 
 void
 __glXDisp_CullFace(GLbyte * pc)
 {
-    CALL_CullFace(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                  ));
+    glCullFace(*(GLenum *) (pc + 0));
 }
 
 void
 __glXDisp_Fogf(GLbyte * pc)
 {
-    CALL_Fogf(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4)
-              ));
+    glFogf(*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4));
 }
 
 void
@@ -830,14 +731,13 @@ __glXDisp_Fogfv(GLbyte * pc)
 
     params = (const GLfloat *) (pc + 4);
 
-    CALL_Fogfv(GET_DISPATCH(), (pname, params));
+    glFogfv(pname, params);
 }
 
 void
 __glXDisp_Fogi(GLbyte * pc)
 {
-    CALL_Fogi(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLint *) (pc + 4)
-              ));
+    glFogi(*(GLenum *) (pc + 0), *(GLint *) (pc + 4));
 }
 
 void
@@ -848,29 +748,25 @@ __glXDisp_Fogiv(GLbyte * pc)
 
     params = (const GLint *) (pc + 4);
 
-    CALL_Fogiv(GET_DISPATCH(), (pname, params));
+    glFogiv(pname, params);
 }
 
 void
 __glXDisp_FrontFace(GLbyte * pc)
 {
-    CALL_FrontFace(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                   ));
+    glFrontFace(*(GLenum *) (pc + 0));
 }
 
 void
 __glXDisp_Hint(GLbyte * pc)
 {
-    CALL_Hint(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLenum *) (pc + 4)
-              ));
+    glHint(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4));
 }
 
 void
 __glXDisp_Lightf(GLbyte * pc)
 {
-    CALL_Lightf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                 *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)
-                ));
+    glLightf(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8));
 }
 
 void
@@ -881,15 +777,13 @@ __glXDisp_Lightfv(GLbyte * pc)
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_Lightfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    glLightfv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
 __glXDisp_Lighti(GLbyte * pc)
 {
-    CALL_Lighti(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                 *(GLenum *) (pc + 4), *(GLint *) (pc + 8)
-                ));
+    glLighti(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4), *(GLint *) (pc + 8));
 }
 
 void
@@ -900,15 +794,13 @@ __glXDisp_Lightiv(GLbyte * pc)
 
     params = (const GLint *) (pc + 8);
 
-    CALL_Lightiv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    glLightiv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
 __glXDisp_LightModelf(GLbyte * pc)
 {
-    CALL_LightModelf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                      *(GLfloat *) (pc + 4)
-                     ));
+    glLightModelf(*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4));
 }
 
 void
@@ -919,14 +811,13 @@ __glXDisp_LightModelfv(GLbyte * pc)
 
     params = (const GLfloat *) (pc + 4);
 
-    CALL_LightModelfv(GET_DISPATCH(), (pname, params));
+    glLightModelfv(pname, params);
 }
 
 void
 __glXDisp_LightModeli(GLbyte * pc)
 {
-    CALL_LightModeli(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLint *) (pc + 4)
-                     ));
+    glLightModeli(*(GLenum *) (pc + 0), *(GLint *) (pc + 4));
 }
 
 void
@@ -937,30 +828,26 @@ __glXDisp_LightModeliv(GLbyte * pc)
 
     params = (const GLint *) (pc + 4);
 
-    CALL_LightModeliv(GET_DISPATCH(), (pname, params));
+    glLightModeliv(pname, params);
 }
 
 void
 __glXDisp_LineStipple(GLbyte * pc)
 {
-    CALL_LineStipple(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                      *(GLushort *) (pc + 4)
-                     ));
+    glLineStipple(*(GLint *) (pc + 0), *(GLushort *) (pc + 4));
 }
 
 void
 __glXDisp_LineWidth(GLbyte * pc)
 {
-    CALL_LineWidth(GET_DISPATCH(), (*(GLfloat *) (pc + 0)
-                   ));
+    glLineWidth(*(GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_Materialf(GLbyte * pc)
 {
-    CALL_Materialf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                    *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)
-                   ));
+    glMaterialf(*(GLenum *) (pc + 0),
+                *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8));
 }
 
 void
@@ -971,15 +858,14 @@ __glXDisp_Materialfv(GLbyte * pc)
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_Materialfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    glMaterialfv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
 __glXDisp_Materiali(GLbyte * pc)
 {
-    CALL_Materiali(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                    *(GLenum *) (pc + 4), *(GLint *) (pc + 8)
-                   ));
+    glMateriali(*(GLenum *) (pc + 0),
+                *(GLenum *) (pc + 4), *(GLint *) (pc + 8));
 }
 
 void
@@ -990,21 +876,19 @@ __glXDisp_Materialiv(GLbyte * pc)
 
     params = (const GLint *) (pc + 8);
 
-    CALL_Materialiv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    glMaterialiv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
 __glXDisp_PointSize(GLbyte * pc)
 {
-    CALL_PointSize(GET_DISPATCH(), (*(GLfloat *) (pc + 0)
-                   ));
+    glPointSize(*(GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_PolygonMode(GLbyte * pc)
 {
-    CALL_PolygonMode(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLenum *) (pc + 4)
-                     ));
+    glPolygonMode(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4));
 }
 
 void
@@ -1013,42 +897,34 @@ __glXDisp_PolygonStipple(GLbyte * pc)
     const GLubyte *const mask = (const GLubyte *) ((pc + 20));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    CALL_PolygonStipple(GET_DISPATCH(), (mask));
+    glPolygonStipple(mask);
 }
 
 void
 __glXDisp_Scissor(GLbyte * pc)
 {
-    CALL_Scissor(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                  *(GLint *) (pc + 4),
-                                  *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12)
-                 ));
+    glScissor(*(GLint *) (pc + 0),
+              *(GLint *) (pc + 4),
+              *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12));
 }
 
 void
 __glXDisp_ShadeModel(GLbyte * pc)
 {
-    CALL_ShadeModel(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                    ));
+    glShadeModel(*(GLenum *) (pc + 0));
 }
 
 void
 __glXDisp_TexParameterf(GLbyte * pc)
 {
-    CALL_TexParameterf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLenum *) (pc + 4),
-                                        *(GLfloat *) (pc + 8)
-                       ));
+    glTexParameterf(*(GLenum *) (pc + 0),
+                    *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8));
 }
 
 void
@@ -1059,16 +935,14 @@ __glXDisp_TexParameterfv(GLbyte * pc)
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_TexParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    glTexParameterfv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
 __glXDisp_TexParameteri(GLbyte * pc)
 {
-    CALL_TexParameteri(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLenum *) (pc + 4),
-                                        *(GLint *) (pc + 8)
-                       ));
+    glTexParameteri(*(GLenum *) (pc + 0),
+                    *(GLenum *) (pc + 4), *(GLint *) (pc + 8));
 }
 
 void
@@ -1079,7 +953,7 @@ __glXDisp_TexParameteriv(GLbyte * pc)
 
     params = (const GLint *) (pc + 8);
 
-    CALL_TexParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    glTexParameteriv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
@@ -1088,24 +962,19 @@ __glXDisp_TexImage1D(GLbyte * pc)
     const GLvoid *const pixels = (const GLvoid *) ((pc + 52));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    CALL_TexImage1D(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                     *(GLint *) (pc + 24),
-                                     *(GLint *) (pc + 28),
-                                     *(GLsizei *) (pc + 32),
-                                     *(GLint *) (pc + 40),
-                                     *(GLenum *) (pc + 44),
-                                     *(GLenum *) (pc + 48), pixels));
+    glTexImage1D(*(GLenum *) (pc + 20),
+                 *(GLint *) (pc + 24),
+                 *(GLint *) (pc + 28),
+                 *(GLsizei *) (pc + 32),
+                 *(GLint *) (pc + 40),
+                 *(GLenum *) (pc + 44), *(GLenum *) (pc + 48), pixels);
 }
 
 void
@@ -1114,33 +983,27 @@ __glXDisp_TexImage2D(GLbyte * pc)
     const GLvoid *const pixels = (const GLvoid *) ((pc + 52));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    CALL_TexImage2D(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                     *(GLint *) (pc + 24),
-                                     *(GLint *) (pc + 28),
-                                     *(GLsizei *) (pc + 32),
-                                     *(GLsizei *) (pc + 36),
-                                     *(GLint *) (pc + 40),
-                                     *(GLenum *) (pc + 44),
-                                     *(GLenum *) (pc + 48), pixels));
+    glTexImage2D(*(GLenum *) (pc + 20),
+                 *(GLint *) (pc + 24),
+                 *(GLint *) (pc + 28),
+                 *(GLsizei *) (pc + 32),
+                 *(GLsizei *) (pc + 36),
+                 *(GLint *) (pc + 40),
+                 *(GLenum *) (pc + 44), *(GLenum *) (pc + 48), pixels);
 }
 
 void
 __glXDisp_TexEnvf(GLbyte * pc)
 {
-    CALL_TexEnvf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                  *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)
-                 ));
+    glTexEnvf(*(GLenum *) (pc + 0),
+              *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8));
 }
 
 void
@@ -1151,15 +1014,13 @@ __glXDisp_TexEnvfv(GLbyte * pc)
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_TexEnvfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    glTexEnvfv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
 __glXDisp_TexEnvi(GLbyte * pc)
 {
-    CALL_TexEnvi(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                  *(GLenum *) (pc + 4), *(GLint *) (pc + 8)
-                 ));
+    glTexEnvi(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4), *(GLint *) (pc + 8));
 }
 
 void
@@ -1170,7 +1031,7 @@ __glXDisp_TexEnviv(GLbyte * pc)
 
     params = (const GLint *) (pc + 8);
 
-    CALL_TexEnviv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    glTexEnviv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
@@ -1183,9 +1044,8 @@ __glXDisp_TexGend(GLbyte * pc)
     }
 #endif
 
-    CALL_TexGend(GET_DISPATCH(), (*(GLenum *) (pc + 8),
-                                  *(GLenum *) (pc + 12), *(GLdouble *) (pc + 0)
-                 ));
+    glTexGend(*(GLenum *) (pc + 8),
+              *(GLenum *) (pc + 12), *(GLdouble *) (pc + 0));
 }
 
 void
@@ -1206,15 +1066,14 @@ __glXDisp_TexGendv(GLbyte * pc)
 
     params = (const GLdouble *) (pc + 8);
 
-    CALL_TexGendv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    glTexGendv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
 __glXDisp_TexGenf(GLbyte * pc)
 {
-    CALL_TexGenf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                  *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)
-                 ));
+    glTexGenf(*(GLenum *) (pc + 0),
+              *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8));
 }
 
 void
@@ -1225,15 +1084,13 @@ __glXDisp_TexGenfv(GLbyte * pc)
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_TexGenfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    glTexGenfv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
 __glXDisp_TexGeni(GLbyte * pc)
 {
-    CALL_TexGeni(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                  *(GLenum *) (pc + 4), *(GLint *) (pc + 8)
-                 ));
+    glTexGeni(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4), *(GLint *) (pc + 8));
 }
 
 void
@@ -1244,88 +1101,77 @@ __glXDisp_TexGeniv(GLbyte * pc)
 
     params = (const GLint *) (pc + 8);
 
-    CALL_TexGeniv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    glTexGeniv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
 __glXDisp_InitNames(GLbyte * pc)
 {
-    CALL_InitNames(GET_DISPATCH(), ());
+    glInitNames();
 }
 
 void
 __glXDisp_LoadName(GLbyte * pc)
 {
-    CALL_LoadName(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                  ));
+    glLoadName(*(GLuint *) (pc + 0));
 }
 
 void
 __glXDisp_PassThrough(GLbyte * pc)
 {
-    CALL_PassThrough(GET_DISPATCH(), (*(GLfloat *) (pc + 0)
-                     ));
+    glPassThrough(*(GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_PopName(GLbyte * pc)
 {
-    CALL_PopName(GET_DISPATCH(), ());
+    glPopName();
 }
 
 void
 __glXDisp_PushName(GLbyte * pc)
 {
-    CALL_PushName(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                  ));
+    glPushName(*(GLuint *) (pc + 0));
 }
 
 void
 __glXDisp_DrawBuffer(GLbyte * pc)
 {
-    CALL_DrawBuffer(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                    ));
+    glDrawBuffer(*(GLenum *) (pc + 0));
 }
 
 void
 __glXDisp_Clear(GLbyte * pc)
 {
-    CALL_Clear(GET_DISPATCH(), (*(GLbitfield *) (pc + 0)
-               ));
+    glClear(*(GLbitfield *) (pc + 0));
 }
 
 void
 __glXDisp_ClearAccum(GLbyte * pc)
 {
-    CALL_ClearAccum(GET_DISPATCH(), (*(GLfloat *) (pc + 0),
-                                     *(GLfloat *) (pc + 4),
-                                     *(GLfloat *) (pc + 8),
-                                     *(GLfloat *) (pc + 12)
-                    ));
+    glClearAccum(*(GLfloat *) (pc + 0),
+                 *(GLfloat *) (pc + 4),
+                 *(GLfloat *) (pc + 8), *(GLfloat *) (pc + 12));
 }
 
 void
 __glXDisp_ClearIndex(GLbyte * pc)
 {
-    CALL_ClearIndex(GET_DISPATCH(), (*(GLfloat *) (pc + 0)
-                    ));
+    glClearIndex(*(GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_ClearColor(GLbyte * pc)
 {
-    CALL_ClearColor(GET_DISPATCH(), (*(GLclampf *) (pc + 0),
-                                     *(GLclampf *) (pc + 4),
-                                     *(GLclampf *) (pc + 8),
-                                     *(GLclampf *) (pc + 12)
-                    ));
+    glClearColor(*(GLclampf *) (pc + 0),
+                 *(GLclampf *) (pc + 4),
+                 *(GLclampf *) (pc + 8), *(GLclampf *) (pc + 12));
 }
 
 void
 __glXDisp_ClearStencil(GLbyte * pc)
 {
-    CALL_ClearStencil(GET_DISPATCH(), (*(GLint *) (pc + 0)
-                      ));
+    glClearStencil(*(GLint *) (pc + 0));
 }
 
 void
@@ -1338,73 +1184,63 @@ __glXDisp_ClearDepth(GLbyte * pc)
     }
 #endif
 
-    CALL_ClearDepth(GET_DISPATCH(), (*(GLclampd *) (pc + 0)
-                    ));
+    glClearDepth(*(GLclampd *) (pc + 0));
 }
 
 void
 __glXDisp_StencilMask(GLbyte * pc)
 {
-    CALL_StencilMask(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                     ));
+    glStencilMask(*(GLuint *) (pc + 0));
 }
 
 void
 __glXDisp_ColorMask(GLbyte * pc)
 {
-    CALL_ColorMask(GET_DISPATCH(), (*(GLboolean *) (pc + 0),
-                                    *(GLboolean *) (pc + 1),
-                                    *(GLboolean *) (pc + 2),
-                                    *(GLboolean *) (pc + 3)
-                   ));
+    glColorMask(*(GLboolean *) (pc + 0),
+                *(GLboolean *) (pc + 1),
+                *(GLboolean *) (pc + 2), *(GLboolean *) (pc + 3));
 }
 
 void
 __glXDisp_DepthMask(GLbyte * pc)
 {
-    CALL_DepthMask(GET_DISPATCH(), (*(GLboolean *) (pc + 0)
-                   ));
+    glDepthMask(*(GLboolean *) (pc + 0));
 }
 
 void
 __glXDisp_IndexMask(GLbyte * pc)
 {
-    CALL_IndexMask(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                   ));
+    glIndexMask(*(GLuint *) (pc + 0));
 }
 
 void
 __glXDisp_Accum(GLbyte * pc)
 {
-    CALL_Accum(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4)
-               ));
+    glAccum(*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4));
 }
 
 void
 __glXDisp_Disable(GLbyte * pc)
 {
-    CALL_Disable(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                 ));
+    glDisable(*(GLenum *) (pc + 0));
 }
 
 void
 __glXDisp_Enable(GLbyte * pc)
 {
-    CALL_Enable(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                ));
+    glEnable(*(GLenum *) (pc + 0));
 }
 
 void
 __glXDisp_PopAttrib(GLbyte * pc)
 {
-    CALL_PopAttrib(GET_DISPATCH(), ());
+    glPopAttrib();
 }
 
 void
 __glXDisp_PushAttrib(GLbyte * pc)
 {
-    CALL_PushAttrib(GET_DISPATCH(), (*(GLbitfield *) (pc + 0)
-                    ));
+    glPushAttrib(*(GLbitfield *) (pc + 0));
 }
 
 void
@@ -1417,18 +1253,15 @@ __glXDisp_MapGrid1d(GLbyte * pc)
     }
 #endif
 
-    CALL_MapGrid1d(GET_DISPATCH(), (*(GLint *) (pc + 16),
-                                    *(GLdouble *) (pc + 0),
-                                    *(GLdouble *) (pc + 8)
-                   ));
+    glMapGrid1d(*(GLint *) (pc + 16),
+                *(GLdouble *) (pc + 0), *(GLdouble *) (pc + 8));
 }
 
 void
 __glXDisp_MapGrid1f(GLbyte * pc)
 {
-    CALL_MapGrid1f(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                    *(GLfloat *) (pc + 4), *(GLfloat *) (pc + 8)
-                   ));
+    glMapGrid1f(*(GLint *) (pc + 0),
+                *(GLfloat *) (pc + 4), *(GLfloat *) (pc + 8));
 }
 
 void
@@ -1441,25 +1274,21 @@ __glXDisp_MapGrid2d(GLbyte * pc)
     }
 #endif
 
-    CALL_MapGrid2d(GET_DISPATCH(), (*(GLint *) (pc + 32),
-                                    *(GLdouble *) (pc + 0),
-                                    *(GLdouble *) (pc + 8),
-                                    *(GLint *) (pc + 36),
-                                    *(GLdouble *) (pc + 16),
-                                    *(GLdouble *) (pc + 24)
-                   ));
+    glMapGrid2d(*(GLint *) (pc + 32),
+                *(GLdouble *) (pc + 0),
+                *(GLdouble *) (pc + 8),
+                *(GLint *) (pc + 36),
+                *(GLdouble *) (pc + 16), *(GLdouble *) (pc + 24));
 }
 
 void
 __glXDisp_MapGrid2f(GLbyte * pc)
 {
-    CALL_MapGrid2f(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                    *(GLfloat *) (pc + 4),
-                                    *(GLfloat *) (pc + 8),
-                                    *(GLint *) (pc + 12),
-                                    *(GLfloat *) (pc + 16),
-                                    *(GLfloat *) (pc + 20)
-                   ));
+    glMapGrid2f(*(GLint *) (pc + 0),
+                *(GLfloat *) (pc + 4),
+                *(GLfloat *) (pc + 8),
+                *(GLint *) (pc + 12),
+                *(GLfloat *) (pc + 16), *(GLfloat *) (pc + 20));
 }
 
 void
@@ -1472,15 +1301,13 @@ __glXDisp_EvalCoord1dv(GLbyte * pc)
     }
 #endif
 
-    CALL_EvalCoord1dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                      ));
+    glEvalCoord1dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_EvalCoord1fv(GLbyte * pc)
 {
-    CALL_EvalCoord1fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                      ));
+    glEvalCoord1fv((const GLfloat *) (pc + 0));
 }
 
 void
@@ -1493,114 +1320,96 @@ __glXDisp_EvalCoord2dv(GLbyte * pc)
     }
 #endif
 
-    CALL_EvalCoord2dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                      ));
+    glEvalCoord2dv((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_EvalCoord2fv(GLbyte * pc)
 {
-    CALL_EvalCoord2fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                      ));
+    glEvalCoord2fv((const GLfloat *) (pc + 0));
 }
 
 void
 __glXDisp_EvalMesh1(GLbyte * pc)
 {
-    CALL_EvalMesh1(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                    *(GLint *) (pc + 4), *(GLint *) (pc + 8)
-                   ));
+    glEvalMesh1(*(GLenum *) (pc + 0), *(GLint *) (pc + 4), *(GLint *) (pc + 8));
 }
 
 void
 __glXDisp_EvalPoint1(GLbyte * pc)
 {
-    CALL_EvalPoint1(GET_DISPATCH(), (*(GLint *) (pc + 0)
-                    ));
+    glEvalPoint1(*(GLint *) (pc + 0));
 }
 
 void
 __glXDisp_EvalMesh2(GLbyte * pc)
 {
-    CALL_EvalMesh2(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                    *(GLint *) (pc + 4),
-                                    *(GLint *) (pc + 8),
-                                    *(GLint *) (pc + 12), *(GLint *) (pc + 16)
-                   ));
+    glEvalMesh2(*(GLenum *) (pc + 0),
+                *(GLint *) (pc + 4),
+                *(GLint *) (pc + 8),
+                *(GLint *) (pc + 12), *(GLint *) (pc + 16));
 }
 
 void
 __glXDisp_EvalPoint2(GLbyte * pc)
 {
-    CALL_EvalPoint2(GET_DISPATCH(), (*(GLint *) (pc + 0), *(GLint *) (pc + 4)
-                    ));
+    glEvalPoint2(*(GLint *) (pc + 0), *(GLint *) (pc + 4));
 }
 
 void
 __glXDisp_AlphaFunc(GLbyte * pc)
 {
-    CALL_AlphaFunc(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLclampf *) (pc + 4)
-                   ));
+    glAlphaFunc(*(GLenum *) (pc + 0), *(GLclampf *) (pc + 4));
 }
 
 void
 __glXDisp_BlendFunc(GLbyte * pc)
 {
-    CALL_BlendFunc(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLenum *) (pc + 4)
-                   ));
+    glBlendFunc(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4));
 }
 
 void
 __glXDisp_LogicOp(GLbyte * pc)
 {
-    CALL_LogicOp(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                 ));
+    glLogicOp(*(GLenum *) (pc + 0));
 }
 
 void
 __glXDisp_StencilFunc(GLbyte * pc)
 {
-    CALL_StencilFunc(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                      *(GLint *) (pc + 4), *(GLuint *) (pc + 8)
-                     ));
+    glStencilFunc(*(GLenum *) (pc + 0),
+                  *(GLint *) (pc + 4), *(GLuint *) (pc + 8));
 }
 
 void
 __glXDisp_StencilOp(GLbyte * pc)
 {
-    CALL_StencilOp(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                    *(GLenum *) (pc + 4), *(GLenum *) (pc + 8)
-                   ));
+    glStencilOp(*(GLenum *) (pc + 0),
+                *(GLenum *) (pc + 4), *(GLenum *) (pc + 8));
 }
 
 void
 __glXDisp_DepthFunc(GLbyte * pc)
 {
-    CALL_DepthFunc(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                   ));
+    glDepthFunc(*(GLenum *) (pc + 0));
 }
 
 void
 __glXDisp_PixelZoom(GLbyte * pc)
 {
-    CALL_PixelZoom(GET_DISPATCH(), (*(GLfloat *) (pc + 0), *(GLfloat *) (pc + 4)
-                   ));
+    glPixelZoom(*(GLfloat *) (pc + 0), *(GLfloat *) (pc + 4));
 }
 
 void
 __glXDisp_PixelTransferf(GLbyte * pc)
 {
-    CALL_PixelTransferf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                         *(GLfloat *) (pc + 4)
-                        ));
+    glPixelTransferf(*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4));
 }
 
 void
 __glXDisp_PixelTransferi(GLbyte * pc)
 {
-    CALL_PixelTransferi(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                         *(GLint *) (pc + 4)
-                        ));
+    glPixelTransferi(*(GLenum *) (pc + 0), *(GLint *) (pc + 4));
 }
 
 int
@@ -1612,9 +1421,7 @@ __glXDisp_PixelStoref(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        CALL_PixelStoref(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                          *(GLfloat *) (pc + 4)
-                         ));
+        glPixelStoref(*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4));
         error = Success;
     }
 
@@ -1630,9 +1437,7 @@ __glXDisp_PixelStorei(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        CALL_PixelStorei(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                          *(GLint *) (pc + 4)
-                         ));
+        glPixelStorei(*(GLenum *) (pc + 0), *(GLint *) (pc + 4));
         error = Success;
     }
 
@@ -1644,9 +1449,7 @@ __glXDisp_PixelMapfv(GLbyte * pc)
 {
     const GLsizei mapsize = *(GLsizei *) (pc + 4);
 
-    CALL_PixelMapfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                     mapsize, (const GLfloat *) (pc + 8)
-                    ));
+    glPixelMapfv(*(GLenum *) (pc + 0), mapsize, (const GLfloat *) (pc + 8));
 }
 
 void
@@ -1654,9 +1457,7 @@ __glXDisp_PixelMapuiv(GLbyte * pc)
 {
     const GLsizei mapsize = *(GLsizei *) (pc + 4);
 
-    CALL_PixelMapuiv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                      mapsize, (const GLuint *) (pc + 8)
-                     ));
+    glPixelMapuiv(*(GLenum *) (pc + 0), mapsize, (const GLuint *) (pc + 8));
 }
 
 void
@@ -1664,27 +1465,22 @@ __glXDisp_PixelMapusv(GLbyte * pc)
 {
     const GLsizei mapsize = *(GLsizei *) (pc + 4);
 
-    CALL_PixelMapusv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                      mapsize, (const GLushort *) (pc + 8)
-                     ));
+    glPixelMapusv(*(GLenum *) (pc + 0), mapsize, (const GLushort *) (pc + 8));
 }
 
 void
 __glXDisp_ReadBuffer(GLbyte * pc)
 {
-    CALL_ReadBuffer(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                    ));
+    glReadBuffer(*(GLenum *) (pc + 0));
 }
 
 void
 __glXDisp_CopyPixels(GLbyte * pc)
 {
-    CALL_CopyPixels(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                     *(GLint *) (pc + 4),
-                                     *(GLsizei *) (pc + 8),
-                                     *(GLsizei *) (pc + 12),
-                                     *(GLenum *) (pc + 16)
-                    ));
+    glCopyPixels(*(GLint *) (pc + 0),
+                 *(GLint *) (pc + 4),
+                 *(GLsizei *) (pc + 8),
+                 *(GLsizei *) (pc + 12), *(GLenum *) (pc + 16));
 }
 
 void
@@ -1693,21 +1489,16 @@ __glXDisp_DrawPixels(GLbyte * pc)
     const GLvoid *const pixels = (const GLvoid *) ((pc + 36));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    CALL_DrawPixels(GET_DISPATCH(), (*(GLsizei *) (pc + 20),
-                                     *(GLsizei *) (pc + 24),
-                                     *(GLenum *) (pc + 28),
-                                     *(GLenum *) (pc + 32), pixels));
+    glDrawPixels(*(GLsizei *) (pc + 20),
+                 *(GLsizei *) (pc + 24),
+                 *(GLenum *) (pc + 28), *(GLenum *) (pc + 32), pixels);
 }
 
 int
@@ -1731,7 +1522,7 @@ __glXDisp_GetBooleanv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetBooleanv(GET_DISPATCH(), (pname, params));
+        glGetBooleanv(pname, params);
         __glXSendReply(cl->client, params, compsize, 1, GL_FALSE, 0);
         error = Success;
     }
@@ -1750,7 +1541,7 @@ __glXDisp_GetClipPlane(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLdouble equation[4];
 
-        CALL_GetClipPlane(GET_DISPATCH(), (*(GLenum *) (pc + 0), equation));
+        glGetClipPlane(*(GLenum *) (pc + 0), equation);
         __glXSendReply(cl->client, equation, 4, 8, GL_TRUE, 0);
         error = Success;
     }
@@ -1779,7 +1570,7 @@ __glXDisp_GetDoublev(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetDoublev(GET_DISPATCH(), (pname, params));
+        glGetDoublev(pname, params);
         __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -1798,7 +1589,7 @@ __glXDisp_GetError(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLenum retval;
 
-        retval = CALL_GetError(GET_DISPATCH(), ());
+        retval = glGetError();
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -1827,7 +1618,7 @@ __glXDisp_GetFloatv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetFloatv(GET_DISPATCH(), (pname, params));
+        glGetFloatv(pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -1856,7 +1647,7 @@ __glXDisp_GetIntegerv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetIntegerv(GET_DISPATCH(), (pname, params));
+        glGetIntegerv(pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -1885,7 +1676,7 @@ __glXDisp_GetLightfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetLightfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        glGetLightfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -1914,7 +1705,7 @@ __glXDisp_GetLightiv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetLightiv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        glGetLightiv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -1944,7 +1735,7 @@ __glXDisp_GetMapdv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMapdv(GET_DISPATCH(), (target, query, v));
+        glGetMapdv(target, query, v);
         __glXSendReply(cl->client, v, compsize, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -1974,7 +1765,7 @@ __glXDisp_GetMapfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMapfv(GET_DISPATCH(), (target, query, v));
+        glGetMapfv(target, query, v);
         __glXSendReply(cl->client, v, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2004,7 +1795,7 @@ __glXDisp_GetMapiv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMapiv(GET_DISPATCH(), (target, query, v));
+        glGetMapiv(target, query, v);
         __glXSendReply(cl->client, v, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2033,8 +1824,7 @@ __glXDisp_GetMaterialfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMaterialfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            pname, params));
+        glGetMaterialfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2063,8 +1853,7 @@ __glXDisp_GetMaterialiv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMaterialiv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            pname, params));
+        glGetMaterialiv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2093,7 +1882,7 @@ __glXDisp_GetPixelMapfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetPixelMapfv(GET_DISPATCH(), (map, values));
+        glGetPixelMapfv(map, values);
         __glXSendReply(cl->client, values, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2122,7 +1911,7 @@ __glXDisp_GetPixelMapuiv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetPixelMapuiv(GET_DISPATCH(), (map, values));
+        glGetPixelMapuiv(map, values);
         __glXSendReply(cl->client, values, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2151,7 +1940,7 @@ __glXDisp_GetPixelMapusv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetPixelMapusv(GET_DISPATCH(), (map, values));
+        glGetPixelMapusv(map, values);
         __glXSendReply(cl->client, values, compsize, 2, GL_FALSE, 0);
         error = Success;
     }
@@ -2180,7 +1969,7 @@ __glXDisp_GetTexEnvfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexEnvfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        glGetTexEnvfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2209,7 +1998,7 @@ __glXDisp_GetTexEnviv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexEnviv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        glGetTexEnviv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2238,7 +2027,7 @@ __glXDisp_GetTexGendv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexGendv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        glGetTexGendv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -2267,7 +2056,7 @@ __glXDisp_GetTexGenfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexGenfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        glGetTexGenfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2296,7 +2085,7 @@ __glXDisp_GetTexGeniv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexGeniv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        glGetTexGeniv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2325,8 +2114,7 @@ __glXDisp_GetTexParameterfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                pname, params));
+        glGetTexParameterfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2355,8 +2143,7 @@ __glXDisp_GetTexParameteriv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                pname, params));
+        glGetTexParameteriv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2385,9 +2172,8 @@ __glXDisp_GetTexLevelParameterfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexLevelParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLint *) (pc + 4),
-                                                     pname, params));
+        glGetTexLevelParameterfv(*(GLenum *) (pc + 0),
+                                 *(GLint *) (pc + 4), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2416,9 +2202,8 @@ __glXDisp_GetTexLevelParameteriv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexLevelParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLint *) (pc + 4),
-                                                     pname, params));
+        glGetTexLevelParameteriv(*(GLenum *) (pc + 0),
+                                 *(GLint *) (pc + 4), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2437,8 +2222,7 @@ __glXDisp_IsEnabled(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLboolean retval;
 
-        retval = CALL_IsEnabled(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                                ));
+        retval = glIsEnabled(*(GLenum *) (pc + 0));
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2457,8 +2241,7 @@ __glXDisp_IsList(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLboolean retval;
 
-        retval = CALL_IsList(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                             ));
+        retval = glIsList(*(GLuint *) (pc + 0));
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2476,9 +2259,7 @@ __glXDisp_DepthRange(GLbyte * pc)
     }
 #endif
 
-    CALL_DepthRange(GET_DISPATCH(), (*(GLclampd *) (pc + 0),
-                                     *(GLclampd *) (pc + 8)
-                    ));
+    glDepthRange(*(GLclampd *) (pc + 0), *(GLclampd *) (pc + 8));
 }
 
 void
@@ -2491,26 +2272,23 @@ __glXDisp_Frustum(GLbyte * pc)
     }
 #endif
 
-    CALL_Frustum(GET_DISPATCH(), (*(GLdouble *) (pc + 0),
-                                  *(GLdouble *) (pc + 8),
-                                  *(GLdouble *) (pc + 16),
-                                  *(GLdouble *) (pc + 24),
-                                  *(GLdouble *) (pc + 32),
-                                  *(GLdouble *) (pc + 40)
-                 ));
+    glFrustum(*(GLdouble *) (pc + 0),
+              *(GLdouble *) (pc + 8),
+              *(GLdouble *) (pc + 16),
+              *(GLdouble *) (pc + 24),
+              *(GLdouble *) (pc + 32), *(GLdouble *) (pc + 40));
 }
 
 void
 __glXDisp_LoadIdentity(GLbyte * pc)
 {
-    CALL_LoadIdentity(GET_DISPATCH(), ());
+    glLoadIdentity();
 }
 
 void
 __glXDisp_LoadMatrixf(GLbyte * pc)
 {
-    CALL_LoadMatrixf(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                     ));
+    glLoadMatrixf((const GLfloat *) (pc + 0));
 }
 
 void
@@ -2523,22 +2301,19 @@ __glXDisp_LoadMatrixd(GLbyte * pc)
     }
 #endif
 
-    CALL_LoadMatrixd(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                     ));
+    glLoadMatrixd((const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_MatrixMode(GLbyte * pc)
 {
-    CALL_MatrixMode(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                    ));
+    glMatrixMode(*(GLenum *) (pc + 0));
 }
 
 void
 __glXDisp_MultMatrixf(GLbyte * pc)
 {
-    CALL_MultMatrixf(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                     ));
+    glMultMatrixf((const GLfloat *) (pc + 0));
 }
 
 void
@@ -2551,8 +2326,7 @@ __glXDisp_MultMatrixd(GLbyte * pc)
     }
 #endif
 
-    CALL_MultMatrixd(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                     ));
+    glMultMatrixd((const GLdouble *) (pc + 0));
 }
 
 void
@@ -2565,24 +2339,23 @@ __glXDisp_Ortho(GLbyte * pc)
     }
 #endif
 
-    CALL_Ortho(GET_DISPATCH(), (*(GLdouble *) (pc + 0),
-                                *(GLdouble *) (pc + 8),
-                                *(GLdouble *) (pc + 16),
-                                *(GLdouble *) (pc + 24),
-                                *(GLdouble *) (pc + 32), *(GLdouble *) (pc + 40)
-               ));
+    glOrtho(*(GLdouble *) (pc + 0),
+            *(GLdouble *) (pc + 8),
+            *(GLdouble *) (pc + 16),
+            *(GLdouble *) (pc + 24),
+            *(GLdouble *) (pc + 32), *(GLdouble *) (pc + 40));
 }
 
 void
 __glXDisp_PopMatrix(GLbyte * pc)
 {
-    CALL_PopMatrix(GET_DISPATCH(), ());
+    glPopMatrix();
 }
 
 void
 __glXDisp_PushMatrix(GLbyte * pc)
 {
-    CALL_PushMatrix(GET_DISPATCH(), ());
+    glPushMatrix();
 }
 
 void
@@ -2595,20 +2368,17 @@ __glXDisp_Rotated(GLbyte * pc)
     }
 #endif
 
-    CALL_Rotated(GET_DISPATCH(), (*(GLdouble *) (pc + 0),
-                                  *(GLdouble *) (pc + 8),
-                                  *(GLdouble *) (pc + 16),
-                                  *(GLdouble *) (pc + 24)
-                 ));
+    glRotated(*(GLdouble *) (pc + 0),
+              *(GLdouble *) (pc + 8),
+              *(GLdouble *) (pc + 16), *(GLdouble *) (pc + 24));
 }
 
 void
 __glXDisp_Rotatef(GLbyte * pc)
 {
-    CALL_Rotatef(GET_DISPATCH(), (*(GLfloat *) (pc + 0),
-                                  *(GLfloat *) (pc + 4),
-                                  *(GLfloat *) (pc + 8), *(GLfloat *) (pc + 12)
-                 ));
+    glRotatef(*(GLfloat *) (pc + 0),
+              *(GLfloat *) (pc + 4),
+              *(GLfloat *) (pc + 8), *(GLfloat *) (pc + 12));
 }
 
 void
@@ -2621,17 +2391,15 @@ __glXDisp_Scaled(GLbyte * pc)
     }
 #endif
 
-    CALL_Scaled(GET_DISPATCH(), (*(GLdouble *) (pc + 0),
-                                 *(GLdouble *) (pc + 8), *(GLdouble *) (pc + 16)
-                ));
+    glScaled(*(GLdouble *) (pc + 0),
+             *(GLdouble *) (pc + 8), *(GLdouble *) (pc + 16));
 }
 
 void
 __glXDisp_Scalef(GLbyte * pc)
 {
-    CALL_Scalef(GET_DISPATCH(), (*(GLfloat *) (pc + 0),
-                                 *(GLfloat *) (pc + 4), *(GLfloat *) (pc + 8)
-                ));
+    glScalef(*(GLfloat *) (pc + 0),
+             *(GLfloat *) (pc + 4), *(GLfloat *) (pc + 8));
 }
 
 void
@@ -2644,50 +2412,41 @@ __glXDisp_Translated(GLbyte * pc)
     }
 #endif
 
-    CALL_Translated(GET_DISPATCH(), (*(GLdouble *) (pc + 0),
-                                     *(GLdouble *) (pc + 8),
-                                     *(GLdouble *) (pc + 16)
-                    ));
+    glTranslated(*(GLdouble *) (pc + 0),
+                 *(GLdouble *) (pc + 8), *(GLdouble *) (pc + 16));
 }
 
 void
 __glXDisp_Translatef(GLbyte * pc)
 {
-    CALL_Translatef(GET_DISPATCH(), (*(GLfloat *) (pc + 0),
-                                     *(GLfloat *) (pc + 4),
-                                     *(GLfloat *) (pc + 8)
-                    ));
+    glTranslatef(*(GLfloat *) (pc + 0),
+                 *(GLfloat *) (pc + 4), *(GLfloat *) (pc + 8));
 }
 
 void
 __glXDisp_Viewport(GLbyte * pc)
 {
-    CALL_Viewport(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                   *(GLint *) (pc + 4),
-                                   *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12)
-                  ));
+    glViewport(*(GLint *) (pc + 0),
+               *(GLint *) (pc + 4),
+               *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12));
 }
 
 void
 __glXDisp_BindTexture(GLbyte * pc)
 {
-    CALL_BindTexture(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLuint *) (pc + 4)
-                     ));
+    glBindTexture(*(GLenum *) (pc + 0), *(GLuint *) (pc + 4));
 }
 
 void
 __glXDisp_Indexubv(GLbyte * pc)
 {
-    CALL_Indexubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                  ));
+    glIndexubv((const GLubyte *) (pc + 0));
 }
 
 void
 __glXDisp_PolygonOffset(GLbyte * pc)
 {
-    CALL_PolygonOffset(GET_DISPATCH(), (*(GLfloat *) (pc + 0),
-                                        *(GLfloat *) (pc + 4)
-                       ));
+    glPolygonOffset(*(GLfloat *) (pc + 0), *(GLfloat *) (pc + 4));
 }
 
 int
@@ -2706,9 +2465,7 @@ __glXDisp_AreTexturesResident(__GLXclientState * cl, GLbyte * pc)
         GLboolean *residences =
             __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
         retval =
-            CALL_AreTexturesResident(GET_DISPATCH(),
-                                     (n, (const GLuint *) (pc + 4),
-                                      residences));
+            glAreTexturesResident(n, (const GLuint *) (pc + 4), residences);
         __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval);
         error = Success;
     }
@@ -2732,9 +2489,7 @@ __glXDisp_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc)
         GLboolean *residences =
             __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
         retval =
-            CALL_AreTexturesResident(GET_DISPATCH(),
-                                     (n, (const GLuint *) (pc + 4),
-                                      residences));
+            glAreTexturesResident(n, (const GLuint *) (pc + 4), residences);
         __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval);
         error = Success;
     }
@@ -2745,54 +2500,46 @@ __glXDisp_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc)
 void
 __glXDisp_CopyTexImage1D(GLbyte * pc)
 {
-    CALL_CopyTexImage1D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                         *(GLint *) (pc + 4),
-                                         *(GLenum *) (pc + 8),
-                                         *(GLint *) (pc + 12),
-                                         *(GLint *) (pc + 16),
-                                         *(GLsizei *) (pc + 20),
-                                         *(GLint *) (pc + 24)
-                        ));
+    glCopyTexImage1D(*(GLenum *) (pc + 0),
+                     *(GLint *) (pc + 4),
+                     *(GLenum *) (pc + 8),
+                     *(GLint *) (pc + 12),
+                     *(GLint *) (pc + 16),
+                     *(GLsizei *) (pc + 20), *(GLint *) (pc + 24));
 }
 
 void
 __glXDisp_CopyTexImage2D(GLbyte * pc)
 {
-    CALL_CopyTexImage2D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                         *(GLint *) (pc + 4),
-                                         *(GLenum *) (pc + 8),
-                                         *(GLint *) (pc + 12),
-                                         *(GLint *) (pc + 16),
-                                         *(GLsizei *) (pc + 20),
-                                         *(GLsizei *) (pc + 24),
-                                         *(GLint *) (pc + 28)
-                        ));
+    glCopyTexImage2D(*(GLenum *) (pc + 0),
+                     *(GLint *) (pc + 4),
+                     *(GLenum *) (pc + 8),
+                     *(GLint *) (pc + 12),
+                     *(GLint *) (pc + 16),
+                     *(GLsizei *) (pc + 20),
+                     *(GLsizei *) (pc + 24), *(GLint *) (pc + 28));
 }
 
 void
 __glXDisp_CopyTexSubImage1D(GLbyte * pc)
 {
-    CALL_CopyTexSubImage1D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            *(GLint *) (pc + 4),
-                                            *(GLint *) (pc + 8),
-                                            *(GLint *) (pc + 12),
-                                            *(GLint *) (pc + 16),
-                                            *(GLsizei *) (pc + 20)
-                           ));
+    glCopyTexSubImage1D(*(GLenum *) (pc + 0),
+                        *(GLint *) (pc + 4),
+                        *(GLint *) (pc + 8),
+                        *(GLint *) (pc + 12),
+                        *(GLint *) (pc + 16), *(GLsizei *) (pc + 20));
 }
 
 void
 __glXDisp_CopyTexSubImage2D(GLbyte * pc)
 {
-    CALL_CopyTexSubImage2D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            *(GLint *) (pc + 4),
-                                            *(GLint *) (pc + 8),
-                                            *(GLint *) (pc + 12),
-                                            *(GLint *) (pc + 16),
-                                            *(GLint *) (pc + 20),
-                                            *(GLsizei *) (pc + 24),
-                                            *(GLsizei *) (pc + 28)
-                           ));
+    glCopyTexSubImage2D(*(GLenum *) (pc + 0),
+                        *(GLint *) (pc + 4),
+                        *(GLint *) (pc + 8),
+                        *(GLint *) (pc + 12),
+                        *(GLint *) (pc + 16),
+                        *(GLint *) (pc + 20),
+                        *(GLsizei *) (pc + 24), *(GLsizei *) (pc + 28));
 }
 
 int
@@ -2806,8 +2553,7 @@ __glXDisp_DeleteTextures(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         const GLsizei n = *(GLsizei *) (pc + 0);
 
-        CALL_DeleteTextures(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                            ));
+        glDeleteTextures(n, (const GLuint *) (pc + 4));
         error = Success;
     }
 
@@ -2825,8 +2571,7 @@ __glXDisp_DeleteTexturesEXT(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         const GLsizei n = *(GLsizei *) (pc + 0);
 
-        CALL_DeleteTextures(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                            ));
+        glDeleteTextures(n, (const GLuint *) (pc + 4));
         error = Success;
     }
 
@@ -2848,7 +2593,7 @@ __glXDisp_GenTextures(__GLXclientState * cl, GLbyte * pc)
         GLuint *textures =
             __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                  4);
-        CALL_GenTextures(GET_DISPATCH(), (n, textures));
+        glGenTextures(n, textures);
         __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0);
         error = Success;
     }
@@ -2871,7 +2616,7 @@ __glXDisp_GenTexturesEXT(__GLXclientState * cl, GLbyte * pc)
         GLuint *textures =
             __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                  4);
-        CALL_GenTextures(GET_DISPATCH(), (n, textures));
+        glGenTextures(n, textures);
         __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0);
         error = Success;
     }
@@ -2890,8 +2635,7 @@ __glXDisp_IsTexture(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLboolean retval;
 
-        retval = CALL_IsTexture(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                                ));
+        retval = glIsTexture(*(GLuint *) (pc + 0));
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2910,8 +2654,7 @@ __glXDisp_IsTextureEXT(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLboolean retval;
 
-        retval = CALL_IsTexture(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                                ));
+        retval = glIsTexture(*(GLuint *) (pc + 0));
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2924,10 +2667,9 @@ __glXDisp_PrioritizeTextures(GLbyte * pc)
 {
     const GLsizei n = *(GLsizei *) (pc + 0);
 
-    CALL_PrioritizeTextures(GET_DISPATCH(), (n,
-                                             (const GLuint *) (pc + 4),
-                                             (const GLclampf *) (pc + 4)
-                            ));
+    glPrioritizeTextures(n,
+                         (const GLuint *) (pc + 4),
+                         (const GLclampf *) (pc + 4));
 }
 
 void
@@ -2936,23 +2678,18 @@ __glXDisp_TexSubImage1D(GLbyte * pc)
     const GLvoid *const pixels = (const GLvoid *) ((pc + 56));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    CALL_TexSubImage1D(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                        *(GLint *) (pc + 24),
-                                        *(GLint *) (pc + 28),
-                                        *(GLsizei *) (pc + 36),
-                                        *(GLenum *) (pc + 44),
-                                        *(GLenum *) (pc + 48), pixels));
+    glTexSubImage1D(*(GLenum *) (pc + 20),
+                    *(GLint *) (pc + 24),
+                    *(GLint *) (pc + 28),
+                    *(GLsizei *) (pc + 36),
+                    *(GLenum *) (pc + 44), *(GLenum *) (pc + 48), pixels);
 }
 
 void
@@ -2961,42 +2698,34 @@ __glXDisp_TexSubImage2D(GLbyte * pc)
     const GLvoid *const pixels = (const GLvoid *) ((pc + 56));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    CALL_TexSubImage2D(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                        *(GLint *) (pc + 24),
-                                        *(GLint *) (pc + 28),
-                                        *(GLint *) (pc + 32),
-                                        *(GLsizei *) (pc + 36),
-                                        *(GLsizei *) (pc + 40),
-                                        *(GLenum *) (pc + 44),
-                                        *(GLenum *) (pc + 48), pixels));
+    glTexSubImage2D(*(GLenum *) (pc + 20),
+                    *(GLint *) (pc + 24),
+                    *(GLint *) (pc + 28),
+                    *(GLint *) (pc + 32),
+                    *(GLsizei *) (pc + 36),
+                    *(GLsizei *) (pc + 40),
+                    *(GLenum *) (pc + 44), *(GLenum *) (pc + 48), pixels);
 }
 
 void
 __glXDisp_BlendColor(GLbyte * pc)
 {
-    CALL_BlendColor(GET_DISPATCH(), (*(GLclampf *) (pc + 0),
-                                     *(GLclampf *) (pc + 4),
-                                     *(GLclampf *) (pc + 8),
-                                     *(GLclampf *) (pc + 12)
-                    ));
+    glBlendColor(*(GLclampf *) (pc + 0),
+                 *(GLclampf *) (pc + 4),
+                 *(GLclampf *) (pc + 8), *(GLclampf *) (pc + 12));
 }
 
 void
 __glXDisp_BlendEquation(GLbyte * pc)
 {
-    CALL_BlendEquation(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                       ));
+    glBlendEquation(*(GLenum *) (pc + 0));
 }
 
 void
@@ -3005,22 +2734,17 @@ __glXDisp_ColorTable(GLbyte * pc)
     const GLvoid *const table = (const GLvoid *) ((pc + 40));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    CALL_ColorTable(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                     *(GLenum *) (pc + 24),
-                                     *(GLsizei *) (pc + 28),
-                                     *(GLenum *) (pc + 32),
-                                     *(GLenum *) (pc + 36), table));
+    glColorTable(*(GLenum *) (pc + 20),
+                 *(GLenum *) (pc + 24),
+                 *(GLsizei *) (pc + 28),
+                 *(GLenum *) (pc + 32), *(GLenum *) (pc + 36), table);
 }
 
 void
@@ -3031,8 +2755,7 @@ __glXDisp_ColorTableParameterfv(GLbyte * pc)
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_ColorTableParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                pname, params));
+    glColorTableParameterfv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
@@ -3043,19 +2766,16 @@ __glXDisp_ColorTableParameteriv(GLbyte * pc)
 
     params = (const GLint *) (pc + 8);
 
-    CALL_ColorTableParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                pname, params));
+    glColorTableParameteriv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
 __glXDisp_CopyColorTable(GLbyte * pc)
 {
-    CALL_CopyColorTable(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                         *(GLenum *) (pc + 4),
-                                         *(GLint *) (pc + 8),
-                                         *(GLint *) (pc + 12),
-                                         *(GLsizei *) (pc + 16)
-                        ));
+    glCopyColorTable(*(GLenum *) (pc + 0),
+                     *(GLenum *) (pc + 4),
+                     *(GLint *) (pc + 8),
+                     *(GLint *) (pc + 12), *(GLsizei *) (pc + 16));
 }
 
 int
@@ -3079,8 +2799,7 @@ __glXDisp_GetColorTableParameterfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                       pname, params));
+        glGetColorTableParameterfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3109,8 +2828,7 @@ __glXDisp_GetColorTableParameterfvSGI(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                       pname, params));
+        glGetColorTableParameterfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3139,8 +2857,7 @@ __glXDisp_GetColorTableParameteriv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                       pname, params));
+        glGetColorTableParameteriv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3169,8 +2886,7 @@ __glXDisp_GetColorTableParameterivSGI(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                       pname, params));
+        glGetColorTableParameteriv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3184,33 +2900,26 @@ __glXDisp_ColorSubTable(GLbyte * pc)
     const GLvoid *const data = (const GLvoid *) ((pc + 40));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    CALL_ColorSubTable(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                        *(GLsizei *) (pc + 24),
-                                        *(GLsizei *) (pc + 28),
-                                        *(GLenum *) (pc + 32),
-                                        *(GLenum *) (pc + 36), data));
+    glColorSubTable(*(GLenum *) (pc + 20),
+                    *(GLsizei *) (pc + 24),
+                    *(GLsizei *) (pc + 28),
+                    *(GLenum *) (pc + 32), *(GLenum *) (pc + 36), data);
 }
 
 void
 __glXDisp_CopyColorSubTable(GLbyte * pc)
 {
-    CALL_CopyColorSubTable(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            *(GLsizei *) (pc + 4),
-                                            *(GLint *) (pc + 8),
-                                            *(GLint *) (pc + 12),
-                                            *(GLsizei *) (pc + 16)
-                           ));
+    glCopyColorSubTable(*(GLenum *) (pc + 0),
+                        *(GLsizei *) (pc + 4),
+                        *(GLint *) (pc + 8),
+                        *(GLint *) (pc + 12), *(GLsizei *) (pc + 16));
 }
 
 void
@@ -3219,22 +2928,17 @@ __glXDisp_ConvolutionFilter1D(GLbyte * pc)
     const GLvoid *const image = (const GLvoid *) ((pc + 44));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    CALL_ConvolutionFilter1D(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                              *(GLenum *) (pc + 24),
-                                              *(GLsizei *) (pc + 28),
-                                              *(GLenum *) (pc + 36),
-                                              *(GLenum *) (pc + 40), image));
+    glConvolutionFilter1D(*(GLenum *) (pc + 20),
+                          *(GLenum *) (pc + 24),
+                          *(GLsizei *) (pc + 28),
+                          *(GLenum *) (pc + 36), *(GLenum *) (pc + 40), image);
 }
 
 void
@@ -3243,32 +2947,25 @@ __glXDisp_ConvolutionFilter2D(GLbyte * pc)
     const GLvoid *const image = (const GLvoid *) ((pc + 44));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    CALL_ConvolutionFilter2D(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                              *(GLenum *) (pc + 24),
-                                              *(GLsizei *) (pc + 28),
-                                              *(GLsizei *) (pc + 32),
-                                              *(GLenum *) (pc + 36),
-                                              *(GLenum *) (pc + 40), image));
+    glConvolutionFilter2D(*(GLenum *) (pc + 20),
+                          *(GLenum *) (pc + 24),
+                          *(GLsizei *) (pc + 28),
+                          *(GLsizei *) (pc + 32),
+                          *(GLenum *) (pc + 36), *(GLenum *) (pc + 40), image);
 }
 
 void
 __glXDisp_ConvolutionParameterf(GLbyte * pc)
 {
-    CALL_ConvolutionParameterf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                *(GLenum *) (pc + 4),
-                                                *(GLfloat *) (pc + 8)
-                               ));
+    glConvolutionParameterf(*(GLenum *) (pc + 0),
+                            *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8));
 }
 
 void
@@ -3279,17 +2976,14 @@ __glXDisp_ConvolutionParameterfv(GLbyte * pc)
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_ConvolutionParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                 pname, params));
+    glConvolutionParameterfv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
 __glXDisp_ConvolutionParameteri(GLbyte * pc)
 {
-    CALL_ConvolutionParameteri(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                *(GLenum *) (pc + 4),
-                                                *(GLint *) (pc + 8)
-                               ));
+    glConvolutionParameteri(*(GLenum *) (pc + 0),
+                            *(GLenum *) (pc + 4), *(GLint *) (pc + 8));
 }
 
 void
@@ -3300,31 +2994,26 @@ __glXDisp_ConvolutionParameteriv(GLbyte * pc)
 
     params = (const GLint *) (pc + 8);
 
-    CALL_ConvolutionParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                 pname, params));
+    glConvolutionParameteriv(*(GLenum *) (pc + 0), pname, params);
 }
 
 void
 __glXDisp_CopyConvolutionFilter1D(GLbyte * pc)
 {
-    CALL_CopyConvolutionFilter1D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLenum *) (pc + 4),
-                                                  *(GLint *) (pc + 8),
-                                                  *(GLint *) (pc + 12),
-                                                  *(GLsizei *) (pc + 16)
-                                 ));
+    glCopyConvolutionFilter1D(*(GLenum *) (pc + 0),
+                              *(GLenum *) (pc + 4),
+                              *(GLint *) (pc + 8),
+                              *(GLint *) (pc + 12), *(GLsizei *) (pc + 16));
 }
 
 void
 __glXDisp_CopyConvolutionFilter2D(GLbyte * pc)
 {
-    CALL_CopyConvolutionFilter2D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLenum *) (pc + 4),
-                                                  *(GLint *) (pc + 8),
-                                                  *(GLint *) (pc + 12),
-                                                  *(GLsizei *) (pc + 16),
-                                                  *(GLsizei *) (pc + 20)
-                                 ));
+    glCopyConvolutionFilter2D(*(GLenum *) (pc + 0),
+                              *(GLenum *) (pc + 4),
+                              *(GLint *) (pc + 8),
+                              *(GLint *) (pc + 12),
+                              *(GLsizei *) (pc + 16), *(GLsizei *) (pc + 20));
 }
 
 int
@@ -3348,8 +3037,7 @@ __glXDisp_GetConvolutionParameterfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                        pname, params));
+        glGetConvolutionParameterfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3378,8 +3066,7 @@ __glXDisp_GetConvolutionParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                        pname, params));
+        glGetConvolutionParameterfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3408,8 +3095,7 @@ __glXDisp_GetConvolutionParameteriv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                        pname, params));
+        glGetConvolutionParameteriv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3438,8 +3124,7 @@ __glXDisp_GetConvolutionParameterivEXT(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                        pname, params));
+        glGetConvolutionParameteriv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3468,8 +3153,7 @@ __glXDisp_GetHistogramParameterfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      pname, params));
+        glGetHistogramParameterfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3498,8 +3182,7 @@ __glXDisp_GetHistogramParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      pname, params));
+        glGetHistogramParameterfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3528,8 +3211,7 @@ __glXDisp_GetHistogramParameteriv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      pname, params));
+        glGetHistogramParameteriv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3558,8 +3240,7 @@ __glXDisp_GetHistogramParameterivEXT(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      pname, params));
+        glGetHistogramParameteriv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3588,8 +3269,7 @@ __glXDisp_GetMinmaxParameterfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                   pname, params));
+        glGetMinmaxParameterfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3618,8 +3298,7 @@ __glXDisp_GetMinmaxParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                   pname, params));
+        glGetMinmaxParameterfv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3648,8 +3327,7 @@ __glXDisp_GetMinmaxParameteriv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                   pname, params));
+        glGetMinmaxParameteriv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3678,8 +3356,7 @@ __glXDisp_GetMinmaxParameterivEXT(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                   pname, params));
+        glGetMinmaxParameteriv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3690,33 +3367,28 @@ __glXDisp_GetMinmaxParameterivEXT(__GLXclientState * cl, GLbyte * pc)
 void
 __glXDisp_Histogram(GLbyte * pc)
 {
-    CALL_Histogram(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                    *(GLsizei *) (pc + 4),
-                                    *(GLenum *) (pc + 8),
-                                    *(GLboolean *) (pc + 12)
-                   ));
+    glHistogram(*(GLenum *) (pc + 0),
+                *(GLsizei *) (pc + 4),
+                *(GLenum *) (pc + 8), *(GLboolean *) (pc + 12));
 }
 
 void
 __glXDisp_Minmax(GLbyte * pc)
 {
-    CALL_Minmax(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                 *(GLenum *) (pc + 4), *(GLboolean *) (pc + 8)
-                ));
+    glMinmax(*(GLenum *) (pc + 0),
+             *(GLenum *) (pc + 4), *(GLboolean *) (pc + 8));
 }
 
 void
 __glXDisp_ResetHistogram(GLbyte * pc)
 {
-    CALL_ResetHistogram(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                        ));
+    glResetHistogram(*(GLenum *) (pc + 0));
 }
 
 void
 __glXDisp_ResetMinmax(GLbyte * pc)
 {
-    CALL_ResetMinmax(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                     ));
+    glResetMinmax(*(GLenum *) (pc + 0));
 }
 
 void
@@ -3727,30 +3399,23 @@ __glXDisp_TexImage3D(GLbyte * pc)
         (const GLvoid *) ((ptr_is_null != 0) ? NULL : (pc + 80));
     __GLXpixel3DHeader *const hdr = (__GLXpixel3DHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_IMAGES, (GLint) hdr->skipImages));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
-
-    CALL_TexImage3D(GET_DISPATCH(), (*(GLenum *) (pc + 36),
-                                     *(GLint *) (pc + 40),
-                                     *(GLint *) (pc + 44),
-                                     *(GLsizei *) (pc + 48),
-                                     *(GLsizei *) (pc + 52),
-                                     *(GLsizei *) (pc + 56),
-                                     *(GLint *) (pc + 64),
-                                     *(GLenum *) (pc + 68),
-                                     *(GLenum *) (pc + 72), pixels));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_IMAGES, (GLint) hdr->skipImages);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
+
+    glTexImage3D(*(GLenum *) (pc + 36),
+                 *(GLint *) (pc + 40),
+                 *(GLint *) (pc + 44),
+                 *(GLsizei *) (pc + 48),
+                 *(GLsizei *) (pc + 52),
+                 *(GLsizei *) (pc + 56),
+                 *(GLint *) (pc + 64),
+                 *(GLenum *) (pc + 68), *(GLenum *) (pc + 72), pixels);
 }
 
 void
@@ -3759,57 +3424,47 @@ __glXDisp_TexSubImage3D(GLbyte * pc)
     const GLvoid *const pixels = (const GLvoid *) ((pc + 88));
     __GLXpixel3DHeader *const hdr = (__GLXpixel3DHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_IMAGES, (GLint) hdr->skipImages));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
-
-    CALL_TexSubImage3D(GET_DISPATCH(), (*(GLenum *) (pc + 36),
-                                        *(GLint *) (pc + 40),
-                                        *(GLint *) (pc + 44),
-                                        *(GLint *) (pc + 48),
-                                        *(GLint *) (pc + 52),
-                                        *(GLsizei *) (pc + 60),
-                                        *(GLsizei *) (pc + 64),
-                                        *(GLsizei *) (pc + 68),
-                                        *(GLenum *) (pc + 76),
-                                        *(GLenum *) (pc + 80), pixels));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
+    glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_IMAGES, (GLint) hdr->skipImages);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
+
+    glTexSubImage3D(*(GLenum *) (pc + 36),
+                    *(GLint *) (pc + 40),
+                    *(GLint *) (pc + 44),
+                    *(GLint *) (pc + 48),
+                    *(GLint *) (pc + 52),
+                    *(GLsizei *) (pc + 60),
+                    *(GLsizei *) (pc + 64),
+                    *(GLsizei *) (pc + 68),
+                    *(GLenum *) (pc + 76), *(GLenum *) (pc + 80), pixels);
 }
 
 void
 __glXDisp_CopyTexSubImage3D(GLbyte * pc)
 {
-    CALL_CopyTexSubImage3D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            *(GLint *) (pc + 4),
-                                            *(GLint *) (pc + 8),
-                                            *(GLint *) (pc + 12),
-                                            *(GLint *) (pc + 16),
-                                            *(GLint *) (pc + 20),
-                                            *(GLint *) (pc + 24),
-                                            *(GLsizei *) (pc + 28),
-                                            *(GLsizei *) (pc + 32)
-                           ));
+    glCopyTexSubImage3D(*(GLenum *) (pc + 0),
+                        *(GLint *) (pc + 4),
+                        *(GLint *) (pc + 8),
+                        *(GLint *) (pc + 12),
+                        *(GLint *) (pc + 16),
+                        *(GLint *) (pc + 20),
+                        *(GLint *) (pc + 24),
+                        *(GLsizei *) (pc + 28), *(GLsizei *) (pc + 32));
 }
 
 void
-__glXDisp_ActiveTextureARB(GLbyte * pc)
+__glXDisp_ActiveTexture(GLbyte * pc)
 {
-    CALL_ActiveTextureARB(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                          ));
+    glActiveTexture(*(GLenum *) (pc + 0));
 }
 
 void
-__glXDisp_MultiTexCoord1dvARB(GLbyte * pc)
+__glXDisp_MultiTexCoord1dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -3818,37 +3473,29 @@ __glXDisp_MultiTexCoord1dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_MultiTexCoord1dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 8),
-                                              (const GLdouble *) (pc + 0)
-                             ));
+    glMultiTexCoord1dv(*(GLenum *) (pc + 8), (const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_MultiTexCoord1fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord1fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLfloat *) (pc + 4)
-                             ));
+    glMultiTexCoord1fvARB(*(GLenum *) (pc + 0), (const GLfloat *) (pc + 4));
 }
 
 void
-__glXDisp_MultiTexCoord1ivARB(GLbyte * pc)
+__glXDisp_MultiTexCoord1iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord1ivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLint *) (pc + 4)
-                             ));
+    glMultiTexCoord1iv(*(GLenum *) (pc + 0), (const GLint *) (pc + 4));
 }
 
 void
-__glXDisp_MultiTexCoord1svARB(GLbyte * pc)
+__glXDisp_MultiTexCoord1sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord1svARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLshort *) (pc + 4)
-                             ));
+    glMultiTexCoord1sv(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
-__glXDisp_MultiTexCoord2dvARB(GLbyte * pc)
+__glXDisp_MultiTexCoord2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -3857,37 +3504,29 @@ __glXDisp_MultiTexCoord2dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_MultiTexCoord2dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 16),
-                                              (const GLdouble *) (pc + 0)
-                             ));
+    glMultiTexCoord2dv(*(GLenum *) (pc + 16), (const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_MultiTexCoord2fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord2fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLfloat *) (pc + 4)
-                             ));
+    glMultiTexCoord2fvARB(*(GLenum *) (pc + 0), (const GLfloat *) (pc + 4));
 }
 
 void
-__glXDisp_MultiTexCoord2ivARB(GLbyte * pc)
+__glXDisp_MultiTexCoord2iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord2ivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLint *) (pc + 4)
-                             ));
+    glMultiTexCoord2iv(*(GLenum *) (pc + 0), (const GLint *) (pc + 4));
 }
 
 void
-__glXDisp_MultiTexCoord2svARB(GLbyte * pc)
+__glXDisp_MultiTexCoord2sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord2svARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLshort *) (pc + 4)
-                             ));
+    glMultiTexCoord2sv(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
-__glXDisp_MultiTexCoord3dvARB(GLbyte * pc)
+__glXDisp_MultiTexCoord3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -3896,37 +3535,29 @@ __glXDisp_MultiTexCoord3dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_MultiTexCoord3dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 24),
-                                              (const GLdouble *) (pc + 0)
-                             ));
+    glMultiTexCoord3dv(*(GLenum *) (pc + 24), (const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_MultiTexCoord3fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord3fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLfloat *) (pc + 4)
-                             ));
+    glMultiTexCoord3fvARB(*(GLenum *) (pc + 0), (const GLfloat *) (pc + 4));
 }
 
 void
-__glXDisp_MultiTexCoord3ivARB(GLbyte * pc)
+__glXDisp_MultiTexCoord3iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord3ivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLint *) (pc + 4)
-                             ));
+    glMultiTexCoord3iv(*(GLenum *) (pc + 0), (const GLint *) (pc + 4));
 }
 
 void
-__glXDisp_MultiTexCoord3svARB(GLbyte * pc)
+__glXDisp_MultiTexCoord3sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord3svARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLshort *) (pc + 4)
-                             ));
+    glMultiTexCoord3sv(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
-__glXDisp_MultiTexCoord4dvARB(GLbyte * pc)
+__glXDisp_MultiTexCoord4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -3935,250 +3566,277 @@ __glXDisp_MultiTexCoord4dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_MultiTexCoord4dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 32),
-                                              (const GLdouble *) (pc + 0)
-                             ));
+    glMultiTexCoord4dv(*(GLenum *) (pc + 32), (const GLdouble *) (pc + 0));
 }
 
 void
 __glXDisp_MultiTexCoord4fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord4fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLfloat *) (pc + 4)
-                             ));
+    glMultiTexCoord4fvARB(*(GLenum *) (pc + 0), (const GLfloat *) (pc + 4));
 }
 
 void
-__glXDisp_MultiTexCoord4ivARB(GLbyte * pc)
+__glXDisp_MultiTexCoord4iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord4ivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLint *) (pc + 4)
-                             ));
+    glMultiTexCoord4iv(*(GLenum *) (pc + 0), (const GLint *) (pc + 4));
 }
 
 void
-__glXDisp_MultiTexCoord4svARB(GLbyte * pc)
+__glXDisp_MultiTexCoord4sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord4svARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLshort *) (pc + 4)
-                             ));
+    glMultiTexCoord4sv(*(GLenum *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
-__glXDisp_SampleCoverageARB(GLbyte * pc)
-{
-    CALL_SampleCoverageARB(GET_DISPATCH(), (*(GLclampf *) (pc + 0),
-                                            *(GLboolean *) (pc + 4)
-                           ));
-}
-
-void
-__glXDisp_CompressedTexImage1DARB(GLbyte * pc)
+__glXDisp_CompressedTexImage1D(GLbyte * pc)
 {
     const GLsizei imageSize = *(GLsizei *) (pc + 20);
 
-    CALL_CompressedTexImage1DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLint *) (pc + 4),
-                                                  *(GLenum *) (pc + 8),
-                                                  *(GLsizei *) (pc + 12),
-                                                  *(GLint *) (pc + 16),
-                                                  imageSize,
-                                                  (const GLvoid *) (pc + 24)
-                                 ));
+    glCompressedTexImage1D(*(GLenum *) (pc + 0),
+                           *(GLint *) (pc + 4),
+                           *(GLenum *) (pc + 8),
+                           *(GLsizei *) (pc + 12),
+                           *(GLint *) (pc + 16),
+                           imageSize, (const GLvoid *) (pc + 24));
 }
 
 void
-__glXDisp_CompressedTexImage2DARB(GLbyte * pc)
+__glXDisp_CompressedTexImage2D(GLbyte * pc)
 {
     const GLsizei imageSize = *(GLsizei *) (pc + 24);
 
-    CALL_CompressedTexImage2DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLint *) (pc + 4),
-                                                  *(GLenum *) (pc + 8),
-                                                  *(GLsizei *) (pc + 12),
-                                                  *(GLsizei *) (pc + 16),
-                                                  *(GLint *) (pc + 20),
-                                                  imageSize,
-                                                  (const GLvoid *) (pc + 28)
-                                 ));
+    glCompressedTexImage2D(*(GLenum *) (pc + 0),
+                           *(GLint *) (pc + 4),
+                           *(GLenum *) (pc + 8),
+                           *(GLsizei *) (pc + 12),
+                           *(GLsizei *) (pc + 16),
+                           *(GLint *) (pc + 20),
+                           imageSize, (const GLvoid *) (pc + 28));
 }
 
 void
-__glXDisp_CompressedTexImage3DARB(GLbyte * pc)
+__glXDisp_CompressedTexImage3D(GLbyte * pc)
 {
     const GLsizei imageSize = *(GLsizei *) (pc + 28);
 
-    CALL_CompressedTexImage3DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLint *) (pc + 4),
-                                                  *(GLenum *) (pc + 8),
-                                                  *(GLsizei *) (pc + 12),
-                                                  *(GLsizei *) (pc + 16),
-                                                  *(GLsizei *) (pc + 20),
-                                                  *(GLint *) (pc + 24),
-                                                  imageSize,
-                                                  (const GLvoid *) (pc + 32)
-                                 ));
+    glCompressedTexImage3D(*(GLenum *) (pc + 0),
+                           *(GLint *) (pc + 4),
+                           *(GLenum *) (pc + 8),
+                           *(GLsizei *) (pc + 12),
+                           *(GLsizei *) (pc + 16),
+                           *(GLsizei *) (pc + 20),
+                           *(GLint *) (pc + 24),
+                           imageSize, (const GLvoid *) (pc + 32));
 }
 
 void
-__glXDisp_CompressedTexSubImage1DARB(GLbyte * pc)
+__glXDisp_CompressedTexSubImage1D(GLbyte * pc)
 {
     const GLsizei imageSize = *(GLsizei *) (pc + 20);
 
-    CALL_CompressedTexSubImage1DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLint *) (pc + 4),
-                                                     *(GLint *) (pc + 8),
-                                                     *(GLsizei *) (pc + 12),
-                                                     *(GLenum *) (pc + 16),
-                                                     imageSize,
-                                                     (const GLvoid *) (pc + 24)
-                                    ));
+    glCompressedTexSubImage1D(*(GLenum *) (pc + 0),
+                              *(GLint *) (pc + 4),
+                              *(GLint *) (pc + 8),
+                              *(GLsizei *) (pc + 12),
+                              *(GLenum *) (pc + 16),
+                              imageSize, (const GLvoid *) (pc + 24));
 }
 
 void
-__glXDisp_CompressedTexSubImage2DARB(GLbyte * pc)
+__glXDisp_CompressedTexSubImage2D(GLbyte * pc)
 {
     const GLsizei imageSize = *(GLsizei *) (pc + 28);
 
-    CALL_CompressedTexSubImage2DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLint *) (pc + 4),
-                                                     *(GLint *) (pc + 8),
-                                                     *(GLint *) (pc + 12),
-                                                     *(GLsizei *) (pc + 16),
-                                                     *(GLsizei *) (pc + 20),
-                                                     *(GLenum *) (pc + 24),
-                                                     imageSize,
-                                                     (const GLvoid *) (pc + 32)
-                                    ));
+    glCompressedTexSubImage2D(*(GLenum *) (pc + 0),
+                              *(GLint *) (pc + 4),
+                              *(GLint *) (pc + 8),
+                              *(GLint *) (pc + 12),
+                              *(GLsizei *) (pc + 16),
+                              *(GLsizei *) (pc + 20),
+                              *(GLenum *) (pc + 24),
+                              imageSize, (const GLvoid *) (pc + 32));
 }
 
 void
-__glXDisp_CompressedTexSubImage3DARB(GLbyte * pc)
+__glXDisp_CompressedTexSubImage3D(GLbyte * pc)
 {
     const GLsizei imageSize = *(GLsizei *) (pc + 36);
 
-    CALL_CompressedTexSubImage3DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLint *) (pc + 4),
-                                                     *(GLint *) (pc + 8),
-                                                     *(GLint *) (pc + 12),
-                                                     *(GLint *) (pc + 16),
-                                                     *(GLsizei *) (pc + 20),
-                                                     *(GLsizei *) (pc + 24),
-                                                     *(GLsizei *) (pc + 28),
-                                                     *(GLenum *) (pc + 32),
-                                                     imageSize,
-                                                     (const GLvoid *) (pc + 40)
-                                    ));
+    glCompressedTexSubImage3D(*(GLenum *) (pc + 0),
+                              *(GLint *) (pc + 4),
+                              *(GLint *) (pc + 8),
+                              *(GLint *) (pc + 12),
+                              *(GLint *) (pc + 16),
+                              *(GLsizei *) (pc + 20),
+                              *(GLsizei *) (pc + 24),
+                              *(GLsizei *) (pc + 28),
+                              *(GLenum *) (pc + 32),
+                              imageSize, (const GLvoid *) (pc + 40));
 }
 
-int
-__glXDisp_GetProgramEnvParameterdvARB(__GLXclientState * cl, GLbyte * pc)
+void
+__glXDisp_SampleCoverage(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    glSampleCoverage(*(GLclampf *) (pc + 0), *(GLboolean *) (pc + 4));
+}
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLdouble params[4];
+void
+__glXDisp_BlendFuncSeparate(GLbyte * pc)
+{
+    glBlendFuncSeparate(*(GLenum *) (pc + 0),
+                        *(GLenum *) (pc + 4),
+                        *(GLenum *) (pc + 8), *(GLenum *) (pc + 12));
+}
 
-        CALL_GetProgramEnvParameterdvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                          *(GLuint *) (pc + 4),
-                                                          params));
-        __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
-        error = Success;
+void
+__glXDisp_FogCoorddv(GLbyte * pc)
+{
+#ifdef __GLX_ALIGN64
+    if ((unsigned long) (pc) & 7) {
+        (void) memmove(pc - 4, pc, 8);
+        pc -= 4;
     }
+#endif
 
-    return error;
+    glFogCoorddv((const GLdouble *) (pc + 0));
 }
 
-int
-__glXDisp_GetProgramEnvParameterfvARB(__GLXclientState * cl, GLbyte * pc)
+void
+__glXDisp_PointParameterf(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    glPointParameterf(*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4));
+}
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLfloat params[4];
+void
+__glXDisp_PointParameterfv(GLbyte * pc)
+{
+    const GLenum pname = *(GLenum *) (pc + 0);
+    const GLfloat *params;
 
-        CALL_GetProgramEnvParameterfvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                          *(GLuint *) (pc + 4),
-                                                          params));
-        __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
-        error = Success;
-    }
+    params = (const GLfloat *) (pc + 4);
 
-    return error;
+    glPointParameterfv(pname, params);
 }
 
-int
-__glXDisp_GetProgramLocalParameterdvARB(__GLXclientState * cl, GLbyte * pc)
+void
+__glXDisp_PointParameteri(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    glPointParameteri(*(GLenum *) (pc + 0), *(GLint *) (pc + 4));
+}
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLdouble params[4];
+void
+__glXDisp_PointParameteriv(GLbyte * pc)
+{
+    const GLenum pname = *(GLenum *) (pc + 0);
+    const GLint *params;
 
-        CALL_GetProgramLocalParameterdvARB(GET_DISPATCH(),
-                                           (*(GLenum *) (pc + 0),
-                                            *(GLuint *) (pc + 4), params));
-        __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
-        error = Success;
+    params = (const GLint *) (pc + 4);
+
+    glPointParameteriv(pname, params);
+}
+
+void
+__glXDisp_SecondaryColor3bv(GLbyte * pc)
+{
+    glSecondaryColor3bv((const GLbyte *) (pc + 0));
+}
+
+void
+__glXDisp_SecondaryColor3dv(GLbyte * pc)
+{
+#ifdef __GLX_ALIGN64
+    if ((unsigned long) (pc) & 7) {
+        (void) memmove(pc - 4, pc, 24);
+        pc -= 4;
     }
+#endif
 
-    return error;
+    glSecondaryColor3dv((const GLdouble *) (pc + 0));
+}
+
+void
+__glXDisp_SecondaryColor3iv(GLbyte * pc)
+{
+    glSecondaryColor3iv((const GLint *) (pc + 0));
+}
+
+void
+__glXDisp_SecondaryColor3sv(GLbyte * pc)
+{
+    glSecondaryColor3sv((const GLshort *) (pc + 0));
+}
+
+void
+__glXDisp_SecondaryColor3ubv(GLbyte * pc)
+{
+    glSecondaryColor3ubv((const GLubyte *) (pc + 0));
+}
+
+void
+__glXDisp_SecondaryColor3uiv(GLbyte * pc)
+{
+    glSecondaryColor3uiv((const GLuint *) (pc + 0));
+}
+
+void
+__glXDisp_SecondaryColor3usv(GLbyte * pc)
+{
+    glSecondaryColor3usv((const GLushort *) (pc + 0));
+}
+
+void
+__glXDisp_WindowPos3fv(GLbyte * pc)
+{
+    glWindowPos3fv((const GLfloat *) (pc + 0));
+}
+
+void
+__glXDisp_BeginQuery(GLbyte * pc)
+{
+    glBeginQuery(*(GLenum *) (pc + 0), *(GLuint *) (pc + 4));
 }
 
 int
-__glXDisp_GetProgramLocalParameterfvARB(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_DeleteQueries(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
     __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
+    pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        GLfloat params[4];
+        const GLsizei n = *(GLsizei *) (pc + 0);
 
-        CALL_GetProgramLocalParameterfvARB(GET_DISPATCH(),
-                                           (*(GLenum *) (pc + 0),
-                                            *(GLuint *) (pc + 4), params));
-        __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
+        glDeleteQueries(n, (const GLuint *) (pc + 4));
         error = Success;
     }
 
     return error;
 }
 
+void
+__glXDisp_EndQuery(GLbyte * pc)
+{
+    glEndQuery(*(GLenum *) (pc + 0));
+}
+
 int
-__glXDisp_GetProgramivARB(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_GenQueries(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
     __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
+    pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
-
-        const GLuint compsize = __glGetProgramivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
-
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+        const GLsizei n = *(GLsizei *) (pc + 0);
 
-        CALL_GetProgramivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              pname, params));
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+        GLuint answerBuffer[200];
+        GLuint *ids =
+            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
+                                 4);
+        glGenQueries(n, ids);
+        __glXSendReply(cl->client, ids, n, 4, GL_TRUE, 0);
         error = Success;
     }
 
@@ -4186,29 +3844,28 @@ __glXDisp_GetProgramivARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDisp_GetVertexAttribdvARB(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_GetQueryObjectiv(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
     __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
+    pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
         const GLenum pname = *(GLenum *) (pc + 4);
 
-        const GLuint compsize = __glGetVertexAttribdvARB_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble *params =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
+        const GLuint compsize = __glGetQueryObjectiv_size(pname);
+        GLint answerBuffer[200];
+        GLint *params =
+            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
+                                 sizeof(answerBuffer), 4);
 
         if (params == NULL)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribdvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                   pname, params));
-        __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0);
+        glGetQueryObjectiv(*(GLuint *) (pc + 0), pname, params);
+        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
 
@@ -4216,19 +3873,19 @@ __glXDisp_GetVertexAttribdvARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDisp_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_GetQueryObjectuiv(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
     __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
+    pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
         const GLenum pname = *(GLenum *) (pc + 4);
 
-        const GLuint compsize = __glGetVertexAttribfvARB_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat *params =
+        const GLuint compsize = __glGetQueryObjectuiv_size(pname);
+        GLuint answerBuffer[200];
+        GLuint *params =
             __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
                                  sizeof(answerBuffer), 4);
 
@@ -4236,8 +3893,7 @@ __glXDisp_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribfvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                   pname, params));
+        glGetQueryObjectuiv(*(GLuint *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4246,17 +3902,17 @@ __glXDisp_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDisp_GetVertexAttribivARB(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_GetQueryiv(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
     __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
+    pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
         const GLenum pname = *(GLenum *) (pc + 4);
 
-        const GLuint compsize = __glGetVertexAttribivARB_size(pname);
+        const GLuint compsize = __glGetQueryiv_size(pname);
         GLint answerBuffer[200];
         GLint *params =
             __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
@@ -4266,8 +3922,7 @@ __glXDisp_GetVertexAttribivARB(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                   pname, params));
+        glGetQueryiv(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4275,70 +3930,41 @@ __glXDisp_GetVertexAttribivARB(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDisp_ProgramEnvParameter4dvARB(GLbyte * pc)
+int
+__glXDisp_IsQuery(__GLXclientState * cl, GLbyte * pc)
 {
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 40);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramEnvParameter4dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                    *(GLuint *) (pc + 4),
-                                                    (const GLdouble *) (pc + 8)
-                                   ));
-}
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    int error;
+    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-void
-__glXDisp_ProgramEnvParameter4fvARB(GLbyte * pc)
-{
-    CALL_ProgramEnvParameter4fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                    *(GLuint *) (pc + 4),
-                                                    (const GLfloat *) (pc + 8)
-                                   ));
-}
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if (cx != NULL) {
+        GLboolean retval;
 
-void
-__glXDisp_ProgramLocalParameter4dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 40);
-        pc -= 4;
+        retval = glIsQuery(*(GLuint *) (pc + 0));
+        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
+        error = Success;
     }
-#endif
 
-    CALL_ProgramLocalParameter4dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      *(GLuint *) (pc + 4),
-                                                      (const GLdouble *) (pc +
-                                                                          8)
-                                     ));
+    return error;
 }
 
 void
-__glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc)
+__glXDisp_BlendEquationSeparate(GLbyte * pc)
 {
-    CALL_ProgramLocalParameter4fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      *(GLuint *) (pc + 4),
-                                                      (const GLfloat *) (pc + 8)
-                                     ));
+    glBlendEquationSeparate(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4));
 }
 
 void
-__glXDisp_ProgramStringARB(GLbyte * pc)
+__glXDisp_DrawBuffers(GLbyte * pc)
 {
-    const GLsizei len = *(GLsizei *) (pc + 8);
+    const GLsizei n = *(GLsizei *) (pc + 0);
 
-    CALL_ProgramStringARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                           *(GLenum *) (pc + 4),
-                                           len, (const GLvoid *) (pc + 12)
-                          ));
+    glDrawBuffers(n, (const GLenum *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib1dvARB(GLbyte * pc)
+__glXDisp_VertexAttrib1dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -4347,29 +3973,17 @@ __glXDisp_VertexAttrib1dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib1dvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLdouble *) (pc + 4)
-                            ));
+    glVertexAttrib1dv(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib1fvARB(GLbyte * pc)
+__glXDisp_VertexAttrib1sv(GLbyte * pc)
 {
-    CALL_VertexAttrib1fvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLfloat *) (pc + 4)
-                            ));
+    glVertexAttrib1sv(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib1svARB(GLbyte * pc)
-{
-    CALL_VertexAttrib1svARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLshort *) (pc + 4)
-                            ));
-}
-
-void
-__glXDisp_VertexAttrib2dvARB(GLbyte * pc)
+__glXDisp_VertexAttrib2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -4378,29 +3992,17 @@ __glXDisp_VertexAttrib2dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib2dvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLdouble *) (pc + 4)
-                            ));
-}
-
-void
-__glXDisp_VertexAttrib2fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib2fvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLfloat *) (pc + 4)
-                            ));
+    glVertexAttrib2dv(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib2svARB(GLbyte * pc)
+__glXDisp_VertexAttrib2sv(GLbyte * pc)
 {
-    CALL_VertexAttrib2svARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLshort *) (pc + 4)
-                            ));
+    glVertexAttrib2sv(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib3dvARB(GLbyte * pc)
+__glXDisp_VertexAttrib3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -4409,85 +4011,59 @@ __glXDisp_VertexAttrib3dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib3dvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLdouble *) (pc + 4)
-                            ));
-}
-
-void
-__glXDisp_VertexAttrib3fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib3fvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLfloat *) (pc + 4)
-                            ));
+    glVertexAttrib3dv(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib3svARB(GLbyte * pc)
+__glXDisp_VertexAttrib3sv(GLbyte * pc)
 {
-    CALL_VertexAttrib3svARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLshort *) (pc + 4)
-                            ));
+    glVertexAttrib3sv(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4NbvARB(GLbyte * pc)
+__glXDisp_VertexAttrib4Nbv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NbvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              (const GLbyte *) (pc + 4)
-                             ));
+    glVertexAttrib4Nbv(*(GLuint *) (pc + 0), (const GLbyte *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4NivARB(GLbyte * pc)
+__glXDisp_VertexAttrib4Niv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              (const GLint *) (pc + 4)
-                             ));
+    glVertexAttrib4Niv(*(GLuint *) (pc + 0), (const GLint *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4NsvARB(GLbyte * pc)
+__glXDisp_VertexAttrib4Nsv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NsvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              (const GLshort *) (pc + 4)
-                             ));
+    glVertexAttrib4Nsv(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4NubvARB(GLbyte * pc)
+__glXDisp_VertexAttrib4Nubv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NubvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                               (const GLubyte *) (pc + 4)
-                              ));
+    glVertexAttrib4Nubv(*(GLuint *) (pc + 0), (const GLubyte *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4NuivARB(GLbyte * pc)
+__glXDisp_VertexAttrib4Nuiv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NuivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                               (const GLuint *) (pc + 4)
-                              ));
+    glVertexAttrib4Nuiv(*(GLuint *) (pc + 0), (const GLuint *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4NusvARB(GLbyte * pc)
+__glXDisp_VertexAttrib4Nusv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NusvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                               (const GLushort *) (pc + 4)
-                              ));
+    glVertexAttrib4Nusv(*(GLuint *) (pc + 0), (const GLushort *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4bvARB(GLbyte * pc)
+__glXDisp_VertexAttrib4bv(GLbyte * pc)
 {
-    CALL_VertexAttrib4bvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLbyte *) (pc + 4)
-                            ));
+    glVertexAttrib4bv(*(GLuint *) (pc + 0), (const GLbyte *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4dvARB(GLbyte * pc)
+__glXDisp_VertexAttrib4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -4496,110 +4072,86 @@ __glXDisp_VertexAttrib4dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib4dvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLdouble *) (pc + 4)
-                            ));
+    glVertexAttrib4dv(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4fvARB(GLbyte * pc)
+__glXDisp_VertexAttrib4iv(GLbyte * pc)
 {
-    CALL_VertexAttrib4fvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLfloat *) (pc + 4)
-                            ));
+    glVertexAttrib4iv(*(GLuint *) (pc + 0), (const GLint *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4ivARB(GLbyte * pc)
+__glXDisp_VertexAttrib4sv(GLbyte * pc)
 {
-    CALL_VertexAttrib4ivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLint *) (pc + 4)
-                            ));
+    glVertexAttrib4sv(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4svARB(GLbyte * pc)
+__glXDisp_VertexAttrib4ubv(GLbyte * pc)
 {
-    CALL_VertexAttrib4svARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLshort *) (pc + 4)
-                            ));
+    glVertexAttrib4ubv(*(GLuint *) (pc + 0), (const GLubyte *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4ubvARB(GLbyte * pc)
+__glXDisp_VertexAttrib4uiv(GLbyte * pc)
 {
-    CALL_VertexAttrib4ubvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              (const GLubyte *) (pc + 4)
-                             ));
+    glVertexAttrib4uiv(*(GLuint *) (pc + 0), (const GLuint *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4uivARB(GLbyte * pc)
+__glXDisp_VertexAttrib4usv(GLbyte * pc)
 {
-    CALL_VertexAttrib4uivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              (const GLuint *) (pc + 4)
-                             ));
+    glVertexAttrib4usv(*(GLuint *) (pc + 0), (const GLushort *) (pc + 4));
 }
 
 void
-__glXDisp_VertexAttrib4usvARB(GLbyte * pc)
+__glXDisp_ClampColor(GLbyte * pc)
 {
-    CALL_VertexAttrib4usvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              (const GLushort *) (pc + 4)
-                             ));
+    glClampColor(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4));
 }
 
 void
-__glXDisp_BeginQueryARB(GLbyte * pc)
+__glXDisp_BindProgramARB(GLbyte * pc)
 {
-    CALL_BeginQueryARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLuint *) (pc + 4)
-                       ));
+    glBindProgramARB(*(GLenum *) (pc + 0), *(GLuint *) (pc + 4));
 }
 
 int
-__glXDisp_DeleteQueriesARB(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_DeleteProgramsARB(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
+    pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
         const GLsizei n = *(GLsizei *) (pc + 0);
 
-        CALL_DeleteQueriesARB(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                              ));
+        glDeleteProgramsARB(n, (const GLuint *) (pc + 4));
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDisp_EndQueryARB(GLbyte * pc)
-{
-    CALL_EndQueryARB(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                     ));
-}
-
 int
-__glXDisp_GenQueriesARB(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_GenProgramsARB(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
+    pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
         const GLsizei n = *(GLsizei *) (pc + 0);
 
         GLuint answerBuffer[200];
-        GLuint *ids =
+        GLuint *programs =
             __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                  4);
-        CALL_GenQueriesARB(GET_DISPATCH(), (n, ids));
-        __glXSendReply(cl->client, ids, n, 4, GL_TRUE, 0);
+        glGenProgramsARB(n, programs);
+        __glXSendReply(cl->client, programs, n, 4, GL_TRUE, 0);
         error = Success;
     }
 
@@ -4607,29 +4159,39 @@ __glXDisp_GenQueriesARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDisp_GetQueryObjectivARB(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_GetProgramEnvParameterdvARB(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
+    pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+        GLdouble params[4];
 
-        const GLuint compsize = __glGetQueryObjectivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        glGetProgramEnvParameterdvARB(*(GLenum *) (pc + 0),
+                                      *(GLuint *) (pc + 4), params);
+        __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
+        error = Success;
+    }
 
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+    return error;
+}
 
-        CALL_GetQueryObjectivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                  pname, params));
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+int
+__glXDisp_GetProgramEnvParameterfvARB(__GLXclientState * cl, GLbyte * pc)
+{
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if (cx != NULL) {
+        GLfloat params[4];
+
+        glGetProgramEnvParameterfvARB(*(GLenum *) (pc + 0),
+                                      *(GLuint *) (pc + 4), params);
+        __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
         error = Success;
     }
 
@@ -4637,29 +4199,39 @@ __glXDisp_GetQueryObjectivARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDisp_GetQueryObjectuivARB(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_GetProgramLocalParameterdvARB(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
+    pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+        GLdouble params[4];
 
-        const GLuint compsize = __glGetQueryObjectuivARB_size(pname);
-        GLuint answerBuffer[200];
-        GLuint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        glGetProgramLocalParameterdvARB(*(GLenum *) (pc + 0),
+                                        *(GLuint *) (pc + 4), params);
+        __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
+        error = Success;
+    }
 
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+    return error;
+}
 
-        CALL_GetQueryObjectuivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                   pname, params));
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+int
+__glXDisp_GetProgramLocalParameterfvARB(__GLXclientState * cl, GLbyte * pc)
+{
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if (cx != NULL) {
+        GLfloat params[4];
+
+        glGetProgramLocalParameterfvARB(*(GLenum *) (pc + 0),
+                                        *(GLuint *) (pc + 4), params);
+        __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
         error = Success;
     }
 
@@ -4667,17 +4239,17 @@ __glXDisp_GetQueryObjectuivARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDisp_GetQueryivARB(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_GetProgramivARB(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
+    pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
         const GLenum pname = *(GLenum *) (pc + 4);
 
-        const GLuint compsize = __glGetQueryivARB_size(pname);
+        const GLuint compsize = __glGetProgramivARB_size(pname);
         GLint answerBuffer[200];
         GLint *params =
             __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
@@ -4687,8 +4259,7 @@ __glXDisp_GetQueryivARB(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetQueryivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            pname, params));
+        glGetProgramivARB(*(GLenum *) (pc + 0), pname, params);
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4697,18 +4268,17 @@ __glXDisp_GetQueryivARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDisp_IsQueryARB(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_IsProgramARB(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
+    pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
         GLboolean retval;
 
-        retval = CALL_IsQueryARB(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                                 ));
+        retval = glIsProgramARB(*(GLuint *) (pc + 0));
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -4717,170 +4287,112 @@ __glXDisp_IsQueryARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 void
-__glXDisp_DrawBuffersARB(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei *) (pc + 0);
-
-    CALL_DrawBuffersARB(GET_DISPATCH(), (n, (const GLenum *) (pc + 4)
-                        ));
-}
-
-void
-__glXDisp_ClampColorARB(GLbyte * pc)
-{
-    CALL_ClampColorARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLenum *) (pc + 4)
-                       ));
-}
-
-void
-__glXDisp_RenderbufferStorageMultisample(GLbyte * pc)
-{
-    CALL_RenderbufferStorageMultisample(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                         *(GLsizei *) (pc + 4),
-                                                         *(GLenum *) (pc + 8),
-                                                         *(GLsizei *) (pc + 12),
-                                                         *(GLsizei *) (pc + 16)
-                                        ));
-}
-
-void
-__glXDisp_SampleMaskSGIS(GLbyte * pc)
-{
-    CALL_SampleMaskSGIS(GET_DISPATCH(), (*(GLclampf *) (pc + 0),
-                                         *(GLboolean *) (pc + 4)
-                        ));
-}
-
-void
-__glXDisp_SamplePatternSGIS(GLbyte * pc)
-{
-    CALL_SamplePatternSGIS(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                           ));
-}
-
-void
-__glXDisp_PointParameterfEXT(GLbyte * pc)
-{
-    CALL_PointParameterfEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                             *(GLfloat *) (pc + 4)
-                            ));
-}
-
-void
-__glXDisp_PointParameterfvEXT(GLbyte * pc)
+__glXDisp_ProgramEnvParameter4dvARB(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 0);
-    const GLfloat *params;
-
-    params = (const GLfloat *) (pc + 4);
+#ifdef __GLX_ALIGN64
+    if ((unsigned long) (pc) & 7) {
+        (void) memmove(pc - 4, pc, 40);
+        pc -= 4;
+    }
+#endif
 
-    CALL_PointParameterfvEXT(GET_DISPATCH(), (pname, params));
+    glProgramEnvParameter4dvARB(*(GLenum *) (pc + 0),
+                                *(GLuint *) (pc + 4),
+                                (const GLdouble *) (pc + 8));
 }
 
 void
-__glXDisp_SecondaryColor3bvEXT(GLbyte * pc)
+__glXDisp_ProgramEnvParameter4fvARB(GLbyte * pc)
 {
-    CALL_SecondaryColor3bvEXT(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                              ));
+    glProgramEnvParameter4fvARB(*(GLenum *) (pc + 0),
+                                *(GLuint *) (pc + 4),
+                                (const GLfloat *) (pc + 8));
 }
 
 void
-__glXDisp_SecondaryColor3dvEXT(GLbyte * pc)
+__glXDisp_ProgramLocalParameter4dvARB(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+        (void) memmove(pc - 4, pc, 40);
         pc -= 4;
     }
 #endif
 
-    CALL_SecondaryColor3dvEXT(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                              ));
+    glProgramLocalParameter4dvARB(*(GLenum *) (pc + 0),
+                                  *(GLuint *) (pc + 4),
+                                  (const GLdouble *) (pc + 8));
 }
 
 void
-__glXDisp_SecondaryColor3fvEXT(GLbyte * pc)
+__glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc)
 {
-    CALL_SecondaryColor3fvEXT(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                              ));
+    glProgramLocalParameter4fvARB(*(GLenum *) (pc + 0),
+                                  *(GLuint *) (pc + 4),
+                                  (const GLfloat *) (pc + 8));
 }
 
 void
-__glXDisp_SecondaryColor3ivEXT(GLbyte * pc)
+__glXDisp_ProgramStringARB(GLbyte * pc)
 {
-    CALL_SecondaryColor3ivEXT(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                              ));
-}
+    const GLsizei len = *(GLsizei *) (pc + 8);
 
-void
-__glXDisp_SecondaryColor3svEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3svEXT(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                              ));
+    glProgramStringARB(*(GLenum *) (pc + 0),
+                       *(GLenum *) (pc + 4), len, (const GLvoid *) (pc + 12));
 }
 
 void
-__glXDisp_SecondaryColor3ubvEXT(GLbyte * pc)
+__glXDisp_VertexAttrib1fvARB(GLbyte * pc)
 {
-    CALL_SecondaryColor3ubvEXT(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                               ));
+    glVertexAttrib1fvARB(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4));
 }
 
 void
-__glXDisp_SecondaryColor3uivEXT(GLbyte * pc)
+__glXDisp_VertexAttrib2fvARB(GLbyte * pc)
 {
-    CALL_SecondaryColor3uivEXT(GET_DISPATCH(), ((const GLuint *) (pc + 0)
-                               ));
+    glVertexAttrib2fvARB(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4));
 }
 
 void
-__glXDisp_SecondaryColor3usvEXT(GLbyte * pc)
+__glXDisp_VertexAttrib3fvARB(GLbyte * pc)
 {
-    CALL_SecondaryColor3usvEXT(GET_DISPATCH(), ((const GLushort *) (pc + 0)
-                               ));
+    glVertexAttrib3fvARB(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4));
 }
 
 void
-__glXDisp_FogCoorddvEXT(GLbyte * pc)
+__glXDisp_VertexAttrib4fvARB(GLbyte * pc)
 {
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 8);
-        pc -= 4;
-    }
-#endif
-
-    CALL_FogCoorddvEXT(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                       ));
+    glVertexAttrib4fvARB(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4));
 }
 
 void
-__glXDisp_FogCoordfvEXT(GLbyte * pc)
+__glXDisp_BindFramebuffer(GLbyte * pc)
 {
-    CALL_FogCoordfvEXT(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                       ));
+    glBindFramebuffer(*(GLenum *) (pc + 0), *(GLuint *) (pc + 4));
 }
 
 void
-__glXDisp_BlendFuncSeparateEXT(GLbyte * pc)
+__glXDisp_BindRenderbuffer(GLbyte * pc)
 {
-    CALL_BlendFuncSeparateEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                               *(GLenum *) (pc + 4),
-                                               *(GLenum *) (pc + 8),
-                                               *(GLenum *) (pc + 12)
-                              ));
+    glBindRenderbuffer(*(GLenum *) (pc + 0), *(GLuint *) (pc + 4));
 }
 
 void
-__glXDisp_WindowPos3fvMESA(GLbyte * pc)
+__glXDisp_BlitFramebuffer(GLbyte * pc)
 {
-    CALL_WindowPos3fvMESA(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                          ));
+    glBlitFramebuffer(*(GLint *) (pc + 0),
+                      *(GLint *) (pc + 4),
+                      *(GLint *) (pc + 8),
+                      *(GLint *) (pc + 12),
+                      *(GLint *) (pc + 16),
+                      *(GLint *) (pc + 20),
+                      *(GLint *) (pc + 24),
+                      *(GLint *) (pc + 28),
+                      *(GLbitfield *) (pc + 32), *(GLenum *) (pc + 36));
 }
 
 int
-__glXDisp_AreProgramsResidentNV(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_CheckFramebufferStatus(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -4888,17 +4400,10 @@ __glXDisp_AreProgramsResidentNV(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
+        GLenum retval;
 
-        GLboolean retval;
-        GLboolean answerBuffer[200];
-        GLboolean *residences =
-            __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval =
-            CALL_AreProgramsResidentNV(GET_DISPATCH(),
-                                       (n, (const GLuint *) (pc + 4),
-                                        residences));
-        __glXSendReply(cl->client, residences, n, 1, GL_FALSE, retval);
+        retval = glCheckFramebufferStatus(*(GLenum *) (pc + 0));
+        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
 
@@ -4906,88 +4411,68 @@ __glXDisp_AreProgramsResidentNV(__GLXclientState * cl, GLbyte * pc)
 }
 
 void
-__glXDisp_BindProgramNV(GLbyte * pc)
+__glXDisp_DeleteFramebuffers(GLbyte * pc)
 {
-    CALL_BindProgramNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLuint *) (pc + 4)
-                       ));
+    const GLsizei n = *(GLsizei *) (pc + 0);
+
+    glDeleteFramebuffers(n, (const GLuint *) (pc + 4));
 }
 
-int
-__glXDisp_DeleteProgramsNV(__GLXclientState * cl, GLbyte * pc)
+void
+__glXDisp_DeleteRenderbuffers(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
-
-        CALL_DeleteProgramsNV(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                              ));
-        error = Success;
-    }
+    const GLsizei n = *(GLsizei *) (pc + 0);
 
-    return error;
+    glDeleteRenderbuffers(n, (const GLuint *) (pc + 4));
 }
 
 void
-__glXDisp_ExecuteProgramNV(GLbyte * pc)
+__glXDisp_FramebufferRenderbuffer(GLbyte * pc)
 {
-    CALL_ExecuteProgramNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                           *(GLuint *) (pc + 4),
-                                           (const GLfloat *) (pc + 8)
-                          ));
+    glFramebufferRenderbuffer(*(GLenum *) (pc + 0),
+                              *(GLenum *) (pc + 4),
+                              *(GLenum *) (pc + 8), *(GLuint *) (pc + 12));
 }
 
-int
-__glXDisp_GenProgramsNV(__GLXclientState * cl, GLbyte * pc)
+void
+__glXDisp_FramebufferTexture1D(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
-
-        GLuint answerBuffer[200];
-        GLuint *programs =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenProgramsNV(GET_DISPATCH(), (n, programs));
-        __glXSendReply(cl->client, programs, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
+    glFramebufferTexture1D(*(GLenum *) (pc + 0),
+                           *(GLenum *) (pc + 4),
+                           *(GLenum *) (pc + 8),
+                           *(GLuint *) (pc + 12), *(GLint *) (pc + 16));
 }
 
-int
-__glXDisp_GetProgramParameterdvNV(__GLXclientState * cl, GLbyte * pc)
+void
+__glXDisp_FramebufferTexture2D(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLdouble params[4];
+    glFramebufferTexture2D(*(GLenum *) (pc + 0),
+                           *(GLenum *) (pc + 4),
+                           *(GLenum *) (pc + 8),
+                           *(GLuint *) (pc + 12), *(GLint *) (pc + 16));
+}
 
-        CALL_GetProgramParameterdvNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      *(GLuint *) (pc + 4),
-                                                      *(GLenum *) (pc + 8),
-                                                      params));
-        __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
-        error = Success;
-    }
+void
+__glXDisp_FramebufferTexture3D(GLbyte * pc)
+{
+    glFramebufferTexture3D(*(GLenum *) (pc + 0),
+                           *(GLenum *) (pc + 4),
+                           *(GLenum *) (pc + 8),
+                           *(GLuint *) (pc + 12),
+                           *(GLint *) (pc + 16), *(GLint *) (pc + 20));
+}
 
-    return error;
+void
+__glXDisp_FramebufferTextureLayer(GLbyte * pc)
+{
+    glFramebufferTextureLayer(*(GLenum *) (pc + 0),
+                              *(GLenum *) (pc + 4),
+                              *(GLuint *) (pc + 8),
+                              *(GLint *) (pc + 12), *(GLint *) (pc + 16));
 }
 
 int
-__glXDisp_GetProgramParameterfvNV(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_GenFramebuffers(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -4995,13 +4480,14 @@ __glXDisp_GetProgramParameterfvNV(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        GLfloat params[4];
+        const GLsizei n = *(GLsizei *) (pc + 0);
 
-        CALL_GetProgramParameterfvNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      *(GLuint *) (pc + 4),
-                                                      *(GLenum *) (pc + 8),
-                                                      params));
-        __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
+        GLuint answerBuffer[200];
+        GLuint *framebuffers =
+            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
+                                 4);
+        glGenFramebuffers(n, framebuffers);
+        __glXSendReply(cl->client, framebuffers, n, 4, GL_TRUE, 0);
         error = Success;
     }
 
@@ -5009,7 +4495,7 @@ __glXDisp_GetProgramParameterfvNV(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDisp_GetProgramivNV(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_GenRenderbuffers(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -5017,50 +4503,29 @@ __glXDisp_GetProgramivNV(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
-
-        const GLuint compsize = __glGetProgramivNV_size(pname);
-        GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
-
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+        const GLsizei n = *(GLsizei *) (pc + 0);
 
-        CALL_GetProgramivNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             pname, params));
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+        GLuint answerBuffer[200];
+        GLuint *renderbuffers =
+            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
+                                 4);
+        glGenRenderbuffers(n, renderbuffers);
+        __glXSendReply(cl->client, renderbuffers, n, 4, GL_TRUE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_GetTrackMatrixivNV(__GLXclientState * cl, GLbyte * pc)
+void
+__glXDisp_GenerateMipmap(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLint params[1];
-
-        CALL_GetTrackMatrixivNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                 *(GLuint *) (pc + 4),
-                                                 *(GLenum *) (pc + 8), params));
-        __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
+    glGenerateMipmap(*(GLenum *) (pc + 0));
 }
 
 int
-__glXDisp_GetVertexAttribdvNV(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_GetFramebufferAttachmentParameteriv(__GLXclientState * cl,
+                                              GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -5068,21 +4533,12 @@ __glXDisp_GetVertexAttribdvNV(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
-
-        const GLuint compsize = __glGetVertexAttribdvNV_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble *params =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
-
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+        GLint params[1];
 
-        CALL_GetVertexAttribdvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                  pname, params));
-        __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0);
+        glGetFramebufferAttachmentParameteriv(*(GLenum *) (pc + 0),
+                                              *(GLenum *) (pc + 4),
+                                              *(GLenum *) (pc + 8), params);
+        __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
         error = Success;
     }
 
@@ -5090,7 +4546,7 @@ __glXDisp_GetVertexAttribdvNV(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDisp_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_GetRenderbufferParameteriv(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -5098,21 +4554,11 @@ __glXDisp_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
-
-        const GLuint compsize = __glGetVertexAttribfvNV_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
-
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+        GLint params[1];
 
-        CALL_GetVertexAttribfvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                  pname, params));
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+        glGetRenderbufferParameteriv(*(GLenum *) (pc + 0),
+                                     *(GLenum *) (pc + 4), params);
+        __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
         error = Success;
     }
 
@@ -5120,7 +4566,7 @@ __glXDisp_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDisp_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_IsFramebuffer(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -5128,21 +4574,10 @@ __glXDisp_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
-
-        const GLuint compsize = __glGetVertexAttribivNV_size(pname);
-        GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
-
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+        GLboolean retval;
 
-        CALL_GetVertexAttribivNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                  pname, params));
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+        retval = glIsFramebuffer(*(GLuint *) (pc + 0));
+        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
 
@@ -5150,7 +4585,7 @@ __glXDisp_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDisp_IsProgramNV(__GLXclientState * cl, GLbyte * pc)
+__glXDisp_IsRenderbuffer(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -5160,8 +4595,7 @@ __glXDisp_IsProgramNV(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLboolean retval;
 
-        retval = CALL_IsProgramNV(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                                  ));
+        retval = glIsRenderbuffer(*(GLuint *) (pc + 0));
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -5170,66 +4604,33 @@ __glXDisp_IsProgramNV(__GLXclientState * cl, GLbyte * pc)
 }
 
 void
-__glXDisp_LoadProgramNV(GLbyte * pc)
+__glXDisp_RenderbufferStorage(GLbyte * pc)
 {
-    const GLsizei len = *(GLsizei *) (pc + 8);
-
-    CALL_LoadProgramNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLuint *) (pc + 4),
-                                        len, (const GLubyte *) (pc + 12)
-                       ));
+    glRenderbufferStorage(*(GLenum *) (pc + 0),
+                          *(GLenum *) (pc + 4),
+                          *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12));
 }
 
 void
-__glXDisp_ProgramParameters4dvNV(GLbyte * pc)
-{
-    const GLsizei num = *(GLsizei *) (pc + 8);
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramParameters4dvNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                 *(GLuint *) (pc + 4),
-                                                 num,
-                                                 (const GLdouble *) (pc + 12)
-                                ));
-}
-
-void
-__glXDisp_ProgramParameters4fvNV(GLbyte * pc)
+__glXDisp_RenderbufferStorageMultisample(GLbyte * pc)
 {
-    const GLsizei num = *(GLsizei *) (pc + 8);
-
-    CALL_ProgramParameters4fvNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                 *(GLuint *) (pc + 4),
-                                                 num,
-                                                 (const GLfloat *) (pc + 12)
-                                ));
+    glRenderbufferStorageMultisample(*(GLenum *) (pc + 0),
+                                     *(GLsizei *) (pc + 4),
+                                     *(GLenum *) (pc + 8),
+                                     *(GLsizei *) (pc + 12),
+                                     *(GLsizei *) (pc + 16));
 }
 
 void
-__glXDisp_RequestResidentProgramsNV(GLbyte * pc)
+__glXDisp_SecondaryColor3fvEXT(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 0);
-
-    CALL_RequestResidentProgramsNV(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                                   ));
+    glSecondaryColor3fvEXT((const GLfloat *) (pc + 0));
 }
 
 void
-__glXDisp_TrackMatrixNV(GLbyte * pc)
+__glXDisp_FogCoordfvEXT(GLbyte * pc)
 {
-    CALL_TrackMatrixNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLuint *) (pc + 4),
-                                        *(GLenum *) (pc + 8),
-                                        *(GLenum *) (pc + 12)
-                       ));
+    glFogCoordfvEXT((const GLfloat *) (pc + 0));
 }
 
 void
@@ -5242,25 +4643,19 @@ __glXDisp_VertexAttrib1dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib1dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLdouble *) (pc + 4)
-                           ));
+    glVertexAttrib1dvNV(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4));
 }
 
 void
 __glXDisp_VertexAttrib1fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib1fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLfloat *) (pc + 4)
-                           ));
+    glVertexAttrib1fvNV(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4));
 }
 
 void
 __glXDisp_VertexAttrib1svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib1svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLshort *) (pc + 4)
-                           ));
+    glVertexAttrib1svNV(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
@@ -5273,25 +4668,19 @@ __glXDisp_VertexAttrib2dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib2dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLdouble *) (pc + 4)
-                           ));
+    glVertexAttrib2dvNV(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4));
 }
 
 void
 __glXDisp_VertexAttrib2fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib2fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLfloat *) (pc + 4)
-                           ));
+    glVertexAttrib2fvNV(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4));
 }
 
 void
 __glXDisp_VertexAttrib2svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib2svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLshort *) (pc + 4)
-                           ));
+    glVertexAttrib2svNV(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
@@ -5304,25 +4693,19 @@ __glXDisp_VertexAttrib3dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib3dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLdouble *) (pc + 4)
-                           ));
+    glVertexAttrib3dvNV(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4));
 }
 
 void
 __glXDisp_VertexAttrib3fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib3fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLfloat *) (pc + 4)
-                           ));
+    glVertexAttrib3fvNV(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4));
 }
 
 void
 __glXDisp_VertexAttrib3svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib3svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLshort *) (pc + 4)
-                           ));
+    glVertexAttrib3svNV(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
@@ -5335,33 +4718,25 @@ __glXDisp_VertexAttrib4dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib4dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLdouble *) (pc + 4)
-                           ));
+    glVertexAttrib4dvNV(*(GLuint *) (pc + 0), (const GLdouble *) (pc + 4));
 }
 
 void
 __glXDisp_VertexAttrib4fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib4fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLfloat *) (pc + 4)
-                           ));
+    glVertexAttrib4fvNV(*(GLuint *) (pc + 0), (const GLfloat *) (pc + 4));
 }
 
 void
 __glXDisp_VertexAttrib4svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib4svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLshort *) (pc + 4)
-                           ));
+    glVertexAttrib4svNV(*(GLuint *) (pc + 0), (const GLshort *) (pc + 4));
 }
 
 void
 __glXDisp_VertexAttrib4ubvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib4ubvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLubyte *) (pc + 4)
-                            ));
+    glVertexAttrib4ubvNV(*(GLuint *) (pc + 0), (const GLubyte *) (pc + 4));
 }
 
 void
@@ -5378,9 +4753,7 @@ __glXDisp_VertexAttribs1dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttribs1dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLdouble *) (pc + 8)
-                            ));
+    glVertexAttribs1dvNV(*(GLuint *) (pc + 0), n, (const GLdouble *) (pc + 8));
 }
 
 void
@@ -5388,9 +4761,7 @@ __glXDisp_VertexAttribs1fvNV(GLbyte * pc)
 {
     const GLsizei n = *(GLsizei *) (pc + 4);
 
-    CALL_VertexAttribs1fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLfloat *) (pc + 8)
-                            ));
+    glVertexAttribs1fvNV(*(GLuint *) (pc + 0), n, (const GLfloat *) (pc + 8));
 }
 
 void
@@ -5398,9 +4769,7 @@ __glXDisp_VertexAttribs1svNV(GLbyte * pc)
 {
     const GLsizei n = *(GLsizei *) (pc + 4);
 
-    CALL_VertexAttribs1svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLshort *) (pc + 8)
-                            ));
+    glVertexAttribs1svNV(*(GLuint *) (pc + 0), n, (const GLshort *) (pc + 8));
 }
 
 void
@@ -5417,9 +4786,7 @@ __glXDisp_VertexAttribs2dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttribs2dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLdouble *) (pc + 8)
-                            ));
+    glVertexAttribs2dvNV(*(GLuint *) (pc + 0), n, (const GLdouble *) (pc + 8));
 }
 
 void
@@ -5427,9 +4794,7 @@ __glXDisp_VertexAttribs2fvNV(GLbyte * pc)
 {
     const GLsizei n = *(GLsizei *) (pc + 4);
 
-    CALL_VertexAttribs2fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLfloat *) (pc + 8)
-                            ));
+    glVertexAttribs2fvNV(*(GLuint *) (pc + 0), n, (const GLfloat *) (pc + 8));
 }
 
 void
@@ -5437,9 +4802,7 @@ __glXDisp_VertexAttribs2svNV(GLbyte * pc)
 {
     const GLsizei n = *(GLsizei *) (pc + 4);
 
-    CALL_VertexAttribs2svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLshort *) (pc + 8)
-                            ));
+    glVertexAttribs2svNV(*(GLuint *) (pc + 0), n, (const GLshort *) (pc + 8));
 }
 
 void
@@ -5456,9 +4819,7 @@ __glXDisp_VertexAttribs3dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttribs3dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLdouble *) (pc + 8)
-                            ));
+    glVertexAttribs3dvNV(*(GLuint *) (pc + 0), n, (const GLdouble *) (pc + 8));
 }
 
 void
@@ -5466,9 +4827,7 @@ __glXDisp_VertexAttribs3fvNV(GLbyte * pc)
 {
     const GLsizei n = *(GLsizei *) (pc + 4);
 
-    CALL_VertexAttribs3fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLfloat *) (pc + 8)
-                            ));
+    glVertexAttribs3fvNV(*(GLuint *) (pc + 0), n, (const GLfloat *) (pc + 8));
 }
 
 void
@@ -5476,9 +4835,7 @@ __glXDisp_VertexAttribs3svNV(GLbyte * pc)
 {
     const GLsizei n = *(GLsizei *) (pc + 4);
 
-    CALL_VertexAttribs3svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLshort *) (pc + 8)
-                            ));
+    glVertexAttribs3svNV(*(GLuint *) (pc + 0), n, (const GLshort *) (pc + 8));
 }
 
 void
@@ -5495,9 +4852,7 @@ __glXDisp_VertexAttribs4dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttribs4dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLdouble *) (pc + 8)
-                            ));
+    glVertexAttribs4dvNV(*(GLuint *) (pc + 0), n, (const GLdouble *) (pc + 8));
 }
 
 void
@@ -5505,9 +4860,7 @@ __glXDisp_VertexAttribs4fvNV(GLbyte * pc)
 {
     const GLsizei n = *(GLsizei *) (pc + 4);
 
-    CALL_VertexAttribs4fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLfloat *) (pc + 8)
-                            ));
+    glVertexAttribs4fvNV(*(GLuint *) (pc + 0), n, (const GLfloat *) (pc + 8));
 }
 
 void
@@ -5515,9 +4868,7 @@ __glXDisp_VertexAttribs4svNV(GLbyte * pc)
 {
     const GLsizei n = *(GLsizei *) (pc + 4);
 
-    CALL_VertexAttribs4svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLshort *) (pc + 8)
-                            ));
+    glVertexAttribs4svNV(*(GLuint *) (pc + 0), n, (const GLshort *) (pc + 8));
 }
 
 void
@@ -5525,402 +4876,11 @@ __glXDisp_VertexAttribs4ubvNV(GLbyte * pc)
 {
     const GLsizei n = *(GLsizei *) (pc + 4);
 
-    CALL_VertexAttribs4ubvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              n, (const GLubyte *) (pc + 8)
-                             ));
-}
-
-void
-__glXDisp_PointParameteriNV(GLbyte * pc)
-{
-    CALL_PointParameteriNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            *(GLint *) (pc + 4)
-                           ));
-}
-
-void
-__glXDisp_PointParameterivNV(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum *) (pc + 0);
-    const GLint *params;
-
-    params = (const GLint *) (pc + 4);
-
-    CALL_PointParameterivNV(GET_DISPATCH(), (pname, params));
+    glVertexAttribs4ubvNV(*(GLuint *) (pc + 0), n, (const GLubyte *) (pc + 8));
 }
 
 void
 __glXDisp_ActiveStencilFaceEXT(GLbyte * pc)
 {
-    CALL_ActiveStencilFaceEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                              ));
-}
-
-int
-__glXDisp_GetProgramNamedParameterdvNV(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei len = *(GLsizei *) (pc + 4);
-
-        GLdouble params[4];
-
-        CALL_GetProgramNamedParameterdvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                           len,
-                                                           (const GLubyte *) (pc
-                                                                              +
-                                                                              8),
-                                                           params));
-        __glXSendReply(cl->client, params, 4, 8, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDisp_GetProgramNamedParameterfvNV(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei len = *(GLsizei *) (pc + 4);
-
-        GLfloat params[4];
-
-        CALL_GetProgramNamedParameterfvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                           len,
-                                                           (const GLubyte *) (pc
-                                                                              +
-                                                                              8),
-                                                           params));
-        __glXSendReply(cl->client, params, 4, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDisp_ProgramNamedParameter4dvNV(GLbyte * pc)
-{
-    const GLsizei len = *(GLsizei *) (pc + 36);
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 44 + __GLX_PAD(len) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramNamedParameter4dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 32),
-                                                     len,
-                                                     (const GLubyte *) (pc +
-                                                                        40),
-                                                     (const GLdouble *) (pc + 0)
-                                    ));
-}
-
-void
-__glXDisp_ProgramNamedParameter4fvNV(GLbyte * pc)
-{
-    const GLsizei len = *(GLsizei *) (pc + 4);
-
-    CALL_ProgramNamedParameter4fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                     len,
-                                                     (const GLubyte *) (pc +
-                                                                        24),
-                                                     (const GLfloat *) (pc + 8)
-                                    ));
-}
-
-void
-__glXDisp_BlendEquationSeparateEXT(GLbyte * pc)
-{
-    CALL_BlendEquationSeparateEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                   *(GLenum *) (pc + 4)
-                                  ));
-}
-
-void
-__glXDisp_BindFramebufferEXT(GLbyte * pc)
-{
-    CALL_BindFramebufferEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                             *(GLuint *) (pc + 4)
-                            ));
-}
-
-void
-__glXDisp_BindRenderbufferEXT(GLbyte * pc)
-{
-    CALL_BindRenderbufferEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              *(GLuint *) (pc + 4)
-                             ));
-}
-
-int
-__glXDisp_CheckFramebufferStatusEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLenum retval;
-
-        retval =
-            CALL_CheckFramebufferStatusEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                                           ));
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDisp_DeleteFramebuffersEXT(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei *) (pc + 0);
-
-    CALL_DeleteFramebuffersEXT(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                               ));
-}
-
-void
-__glXDisp_DeleteRenderbuffersEXT(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei *) (pc + 0);
-
-    CALL_DeleteRenderbuffersEXT(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                                ));
-}
-
-void
-__glXDisp_FramebufferRenderbufferEXT(GLbyte * pc)
-{
-    CALL_FramebufferRenderbufferEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLenum *) (pc + 4),
-                                                     *(GLenum *) (pc + 8),
-                                                     *(GLuint *) (pc + 12)
-                                    ));
-}
-
-void
-__glXDisp_FramebufferTexture1DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture1DEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLenum *) (pc + 4),
-                                                  *(GLenum *) (pc + 8),
-                                                  *(GLuint *) (pc + 12),
-                                                  *(GLint *) (pc + 16)
-                                 ));
-}
-
-void
-__glXDisp_FramebufferTexture2DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture2DEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLenum *) (pc + 4),
-                                                  *(GLenum *) (pc + 8),
-                                                  *(GLuint *) (pc + 12),
-                                                  *(GLint *) (pc + 16)
-                                 ));
-}
-
-void
-__glXDisp_FramebufferTexture3DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture3DEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLenum *) (pc + 4),
-                                                  *(GLenum *) (pc + 8),
-                                                  *(GLuint *) (pc + 12),
-                                                  *(GLint *) (pc + 16),
-                                                  *(GLint *) (pc + 20)
-                                 ));
-}
-
-int
-__glXDisp_GenFramebuffersEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
-
-        GLuint answerBuffer[200];
-        GLuint *framebuffers =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenFramebuffersEXT(GET_DISPATCH(), (n, framebuffers));
-        __glXSendReply(cl->client, framebuffers, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDisp_GenRenderbuffersEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
-
-        GLuint answerBuffer[200];
-        GLuint *renderbuffers =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenRenderbuffersEXT(GET_DISPATCH(), (n, renderbuffers));
-        __glXSendReply(cl->client, renderbuffers, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDisp_GenerateMipmapEXT(GLbyte * pc)
-{
-    CALL_GenerateMipmapEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                           ));
-}
-
-int
-__glXDisp_GetFramebufferAttachmentParameterivEXT(__GLXclientState * cl,
-                                                 GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLint params[1];
-
-        CALL_GetFramebufferAttachmentParameterivEXT(GET_DISPATCH(),
-                                                    (*(GLenum *) (pc + 0),
-                                                     *(GLenum *) (pc + 4),
-                                                     *(GLenum *) (pc + 8),
-                                                     params));
-        __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDisp_GetRenderbufferParameterivEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLint params[1];
-
-        CALL_GetRenderbufferParameterivEXT(GET_DISPATCH(),
-                                           (*(GLenum *) (pc + 0),
-                                            *(GLenum *) (pc + 4), params));
-        __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDisp_IsFramebufferEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLboolean retval;
-
-        retval = CALL_IsFramebufferEXT(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                                       ));
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDisp_IsRenderbufferEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLboolean retval;
-
-        retval = CALL_IsRenderbufferEXT(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                                        ));
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDisp_RenderbufferStorageEXT(GLbyte * pc)
-{
-    CALL_RenderbufferStorageEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                 *(GLenum *) (pc + 4),
-                                                 *(GLsizei *) (pc + 8),
-                                                 *(GLsizei *) (pc + 12)
-                                ));
-}
-
-void
-__glXDisp_BlitFramebufferEXT(GLbyte * pc)
-{
-    CALL_BlitFramebufferEXT(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                             *(GLint *) (pc + 4),
-                                             *(GLint *) (pc + 8),
-                                             *(GLint *) (pc + 12),
-                                             *(GLint *) (pc + 16),
-                                             *(GLint *) (pc + 20),
-                                             *(GLint *) (pc + 24),
-                                             *(GLint *) (pc + 28),
-                                             *(GLbitfield *) (pc + 32),
-                                             *(GLenum *) (pc + 36)
-                            ));
-}
-
-void
-__glXDisp_FramebufferTextureLayerEXT(GLbyte * pc)
-{
-    CALL_FramebufferTextureLayerEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLenum *) (pc + 4),
-                                                     *(GLuint *) (pc + 8),
-                                                     *(GLint *) (pc + 12),
-                                                     *(GLint *) (pc + 16)
-                                    ));
+    glActiveStencilFaceEXT(*(GLenum *) (pc + 0));
 }
diff --git a/xorg-server/glx/indirect_dispatch.h b/xorg-server/glx/indirect_dispatch.h
index d75dbe062..e6e3fdacf 100644
--- a/xorg-server/glx/indirect_dispatch.h
+++ b/xorg-server/glx/indirect_dispatch.h
@@ -41,32 +41,18 @@ extern _X_HIDDEN int __glXDispSwap_NewList(struct __GLXclientStateRec *,
                                            GLbyte *);
 extern _X_HIDDEN void __glXDisp_LoadIdentity(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LoadIdentity(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_SampleCoverageARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SampleCoverageARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ConvolutionFilter1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ConvolutionFilter1D(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_BeginQueryARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BeginQueryARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_RasterPos3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos3dv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_PointParameteriNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_PointParameteriNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord1iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord1iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord4sv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_ActiveTextureARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_ActiveTextureARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_BlitFramebufferEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BlitFramebufferEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib3dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttrib4ubvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib4ubvNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramNamedParameterdvNV(struct
-                                                            __GLXclientStateRec
-                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramNamedParameterdvNV(struct
-                                                                __GLXclientStateRec
-                                                                *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Histogram(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Histogram(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetMapfv(struct __GLXclientStateRec *, GLbyte *);
@@ -76,8 +62,8 @@ extern _X_HIDDEN void __glXDisp_RasterPos4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PolygonStipple(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PolygonStipple(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_BlendEquationSeparateEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BlendEquationSeparateEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord1dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1dv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetPixelMapfv(struct __GLXclientStateRec *,
                                              GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetPixelMapfv(struct __GLXclientStateRec *,
@@ -96,6 +82,8 @@ extern _X_HIDDEN int __glXDisp_DestroyPixmap(struct __GLXclientStateRec *,
                                              GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_DestroyPixmap(struct __GLXclientStateRec *,
                                                  GLbyte *);
+extern _X_HIDDEN void __glXDisp_FramebufferTexture1D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_FramebufferTexture1D(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetMapiv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetMapiv(struct __GLXclientStateRec *,
                                             GLbyte *);
@@ -108,10 +96,6 @@ extern _X_HIDDEN void __glXDispSwap_Indexubv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_Render(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_Render(struct __GLXclientStateRec *,
                                           GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetQueryivARB(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetQueryivARB(struct __GLXclientStateRec *,
-                                                 GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexImage3D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexImage3D(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_MakeContextCurrent(struct __GLXclientStateRec *,
@@ -122,23 +106,14 @@ extern _X_HIDDEN int __glXDisp_GetFBConfigs(struct __GLXclientStateRec *,
                                             GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetFBConfigs(struct __GLXclientStateRec *,
                                                 GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib1sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib1sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color3ubv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3ubv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetQueryObjectivARB(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetQueryObjectivARB(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
 extern _X_HIDDEN void __glXDisp_Vertex3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex3dv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_CompressedTexSubImage2DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_CompressedTexSubImage2DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttribs3fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs3fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_LightModeliv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LightModeliv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib1svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib1svARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttribs1dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttribs1dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Normal3bv(GLbyte * pc);
@@ -149,46 +124,52 @@ extern _X_HIDDEN int __glXDispSwap_VendorPrivate(struct __GLXclientStateRec *,
                                                  GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexGeniv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexGeniv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib1fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib1fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex3iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex3iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_RenderbufferStorage(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_RenderbufferStorage(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CopyConvolutionFilter1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyConvolutionFilter1D(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GenQueries(struct __GLXclientStateRec *,
+                                          GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GenQueries(struct __GLXclientStateRec *,
+                                              GLbyte *);
 extern _X_HIDDEN void __glXDisp_BlendColor(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_BlendColor(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_CompressedTexImage3D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_CompressedTexImage3D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Scalef(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Scalef(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Normal3iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Normal3iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PassThrough(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PassThrough(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_FramebufferTextureLayerEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_FramebufferTextureLayerEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Viewport(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Viewport(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4NusvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4NusvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CopyTexSubImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyTexSubImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_DepthRange(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_DepthRange(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetQueryiv(struct __GLXclientStateRec *,
+                                          GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetQueryiv(struct __GLXclientStateRec *,
+                                              GLbyte *);
 extern _X_HIDDEN void __glXDisp_ResetHistogram(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ResetHistogram(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramNamedParameterfvNV(struct
-                                                            __GLXclientStateRec
-                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramNamedParameterfvNV(struct
-                                                                __GLXclientStateRec
-                                                                *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_PointParameterfEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_PointParameterfEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_CompressedTexSubImage2D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_CompressedTexSubImage2D(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3uiv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3uiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord2sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord2sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex4dv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_CompressedTexImage3DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_CompressedTexImage3DARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4Nbv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Nbv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttribs2svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs2svNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color3sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3sv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetConvolutionParameteriv(struct
@@ -209,6 +190,8 @@ extern _X_HIDDEN int __glXDisp_GetVisualConfigs(struct __GLXclientStateRec *,
                                                 GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetVisualConfigs(struct __GLXclientStateRec
                                                     *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_DeleteRenderbuffers(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_DeleteRenderbuffers(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_MultiTexCoord1fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord3iv(GLbyte * pc);
@@ -217,16 +200,24 @@ extern _X_HIDDEN int __glXDisp_CopyContext(struct __GLXclientStateRec *,
                                            GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_CopyContext(struct __GLXclientStateRec *,
                                                GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4usv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4usv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3fv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord4sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PointSize(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PointSize(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PopName(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PopName(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4NbvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4NbvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib2dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib2dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4Nusv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Nusv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex4sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_ClampColor(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_ClampColor(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetTexEnvfv(struct __GLXclientStateRec *,
                                            GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetTexEnvfv(struct __GLXclientStateRec *,
@@ -251,8 +242,6 @@ extern _X_HIDDEN void __glXDisp_AlphaFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_AlphaFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord2iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord2iv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_CompressedTexImage1DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_CompressedTexImage1DARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Rotated(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Rotated(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_ReadPixels(struct __GLXclientStateRec *,
@@ -261,6 +250,8 @@ extern _X_HIDDEN int __glXDispSwap_ReadPixels(struct __GLXclientStateRec *,
                                               GLbyte *);
 extern _X_HIDDEN void __glXDisp_EdgeFlagv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EdgeFlagv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_CompressedTexSubImage1D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_CompressedTexSubImage1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexParameterf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexParameterf(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexParameteri(GLbyte * pc);
@@ -271,12 +262,8 @@ extern _X_HIDDEN int __glXDispSwap_DestroyContext(struct __GLXclientStateRec *,
                                                   GLbyte *);
 extern _X_HIDDEN void __glXDisp_DrawPixels(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_DrawPixels(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord2svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord3svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_GenerateMipmapEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_GenerateMipmapEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord3sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3sv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GenLists(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GenLists(struct __GLXclientStateRec *,
                                             GLbyte *);
@@ -300,6 +287,8 @@ extern _X_HIDDEN void __glXDisp_PixelMapfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PixelMapfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color3usv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3usv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord2iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2iv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_AreTexturesResident(struct __GLXclientStateRec *,
                                                    GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_AreTexturesResident(struct
@@ -310,20 +299,16 @@ extern _X_HIDDEN int __glXDisp_AreTexturesResidentEXT(struct __GLXclientStateRec
 extern _X_HIDDEN int __glXDispSwap_AreTexturesResidentEXT(struct
                                                           __GLXclientStateRec *,
                                                           GLbyte *);
-extern _X_HIDDEN void __glXDisp_PointParameterfvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_PointParameterfvEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color3bv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3bv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3bvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3bvEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib2fvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib2fvARB(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetProgramLocalParameterfvARB(struct
                                                              __GLXclientStateRec
                                                              *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetProgramLocalParameterfvARB(struct
                                                                  __GLXclientStateRec
                                                                  *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_RenderbufferStorageEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_RenderbufferStorageEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ColorTable(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ColorTable(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Accum(GLbyte * pc);
@@ -339,8 +324,6 @@ extern _X_HIDDEN int __glXDispSwap_Finish(struct __GLXclientStateRec *,
                                           GLbyte *);
 extern _X_HIDDEN void __glXDisp_ClearStencil(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ClearStencil(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib3dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib3dvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttribs4ubvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttribs4ubvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ConvolutionParameteriv(GLbyte * pc);
@@ -349,6 +332,8 @@ extern _X_HIDDEN void __glXDisp_RasterPos2fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos2fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord1fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord1fv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord4dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ProgramEnvParameter4fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ProgramEnvParameter4fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_RasterPos4fv(GLbyte * pc);
@@ -365,39 +350,29 @@ extern _X_HIDDEN int __glXDisp_GetTexGendv(struct __GLXclientStateRec *,
                                            GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetTexGendv(struct __GLXclientStateRec *,
                                                GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetVertexAttribfvNV(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVertexAttribfvNV(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN void __glXDisp_LoadProgramNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_LoadProgramNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_EndList(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_EndList(struct __GLXclientStateRec *,
                                            GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_EvalCoord1fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalCoord1fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_EvalMesh2(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalMesh2(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex4fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex4fv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_CheckFramebufferStatusEXT(struct
-                                                         __GLXclientStateRec *,
-                                                         GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CheckFramebufferStatusEXT(struct
-                                                             __GLXclientStateRec
-                                                             *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetVertexAttribivARB(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVertexAttribivARB(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttribs3fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs3fvNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetProgramEnvParameterdvARB(struct
+                                                           __GLXclientStateRec
+                                                           *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramEnvParameterdvARB(struct
+                                                               __GLXclientStateRec
+                                                               *, GLbyte *);
 extern _X_HIDDEN int __glXDisp_GetFBConfigsSGIX(struct __GLXclientStateRec *,
                                                 GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetFBConfigsSGIX(struct __GLXclientStateRec
                                                     *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_BindFramebuffer(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BindFramebuffer(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_CreateNewContext(struct __GLXclientStateRec *,
                                                 GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_CreateNewContext(struct __GLXclientStateRec
@@ -410,14 +385,16 @@ extern _X_HIDDEN int __glXDisp_GetMinmaxEXT(struct __GLXclientStateRec *,
                                             GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetMinmaxEXT(struct __GLXclientStateRec *,
                                                 GLbyte *);
+extern _X_HIDDEN void __glXDisp_BlendFuncSeparate(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BlendFuncSeparate(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Normal3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Normal3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ProgramEnvParameter4dvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ProgramEnvParameter4dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4ivARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_End(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_End(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttribs3svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs3svNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttribs2dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttribs2dvNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_CreateContextAttribsARB(struct
@@ -426,28 +403,24 @@ extern _X_HIDDEN int __glXDisp_CreateContextAttribsARB(struct
 extern _X_HIDDEN int __glXDispSwap_CreateContextAttribsARB(struct
                                                            __GLXclientStateRec
                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetProgramParameterfvNV(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramParameterfvNV(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_BindTexture(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_BindTexture(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib2sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib2sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexSubImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexSubImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexGenfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexGenfv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4bvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4bvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_DrawBuffers(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_DrawBuffers(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_CreateContextWithConfigSGIX(struct
                                                            __GLXclientStateRec
                                                            *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_CreateContextWithConfigSGIX(struct
                                                                __GLXclientStateRec
                                                                *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_FramebufferTexture3DEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_FramebufferTexture3DEXT(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_CopySubBufferMESA(struct __GLXclientStateRec *,
                                                  GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_CopySubBufferMESA(struct __GLXclientStateRec
@@ -461,25 +434,21 @@ extern _X_HIDDEN void __glXDisp_TexCoord3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Indexdv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Indexdv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_FramebufferTexture2DEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_FramebufferTexture2DEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PushName(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PushName(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord2dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_ProgramNamedParameter4fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_ProgramNamedParameter4fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttrib4fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib4fvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib1dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib1dv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_CreateGLXPbufferSGIX(struct __GLXclientStateRec
                                                     *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_CreateGLXPbufferSGIX(struct
                                                         __GLXclientStateRec *,
                                                         GLbyte *);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord1svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_EndQueryARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_EndQueryARB(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_IsRenderbuffer(struct __GLXclientStateRec *,
+                                              GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_IsRenderbuffer(struct __GLXclientStateRec *,
+                                                  GLbyte *);
 extern _X_HIDDEN void __glXDisp_DepthMask(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_DepthMask(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color4iv(GLbyte * pc);
@@ -490,6 +459,8 @@ extern _X_HIDDEN int __glXDispSwap_GetMaterialiv(struct __GLXclientStateRec *,
                                                  GLbyte *);
 extern _X_HIDDEN void __glXDisp_StencilOp(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_StencilOp(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_FramebufferTextureLayer(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_FramebufferTextureLayer(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Ortho(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Ortho(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexEnvfv(GLbyte * pc);
@@ -502,8 +473,11 @@ extern _X_HIDDEN void __glXDisp_LoadMatrixf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LoadMatrixf(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color4bv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color4bv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3usvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3usvEXT(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetCompressedTexImage(struct __GLXclientStateRec
+                                                     *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetCompressedTexImage(struct
+                                                         __GLXclientStateRec *,
+                                                         GLbyte *);
 extern _X_HIDDEN void __glXDisp_VertexAttrib2fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib2fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ProgramLocalParameter4dvARB(GLbyte * pc);
@@ -518,13 +492,13 @@ extern _X_HIDDEN void __glXDisp_RenderbufferStorageMultisample(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RenderbufferStorageMultisample(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord4fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord4fv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_ActiveTexture(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_ActiveTexture(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3bv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3bv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_WaitX(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_WaitX(struct __GLXclientStateRec *,
                                          GLbyte *);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3uivEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3uivEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_FramebufferRenderbufferEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_FramebufferRenderbufferEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttrib1dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib1dvNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GenTextures(struct __GLXclientStateRec *,
@@ -535,8 +509,6 @@ extern _X_HIDDEN int __glXDisp_GenTexturesEXT(struct __GLXclientStateRec *,
                                               GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GenTexturesEXT(struct __GLXclientStateRec *,
                                                   GLbyte *);
-extern _X_HIDDEN void __glXDisp_FramebufferTexture1DEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_FramebufferTexture1DEXT(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetDrawableAttributes(struct __GLXclientStateRec
                                                      *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetDrawableAttributes(struct
@@ -550,6 +522,8 @@ extern _X_HIDDEN void __glXDisp_DrawBuffer(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_DrawBuffer(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord2fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord2fv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord4iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord1sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord1sv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_CreateGLXPixmapWithConfigSGIX(struct
@@ -562,26 +536,22 @@ extern _X_HIDDEN void __glXDisp_DepthFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_DepthFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PixelMapusv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PixelMapusv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_PointParameterivNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_PointParameterivNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_BlendFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_BlendFunc(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_WaitGL(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_WaitGL(struct __GLXclientStateRec *,
                                           GLbyte *);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord3dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_ProgramNamedParameter4dvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_ProgramNamedParameter4dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_CompressedTexImage2D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_CompressedTexImage2D(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_Flush(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_Flush(struct __GLXclientStateRec *,
                                          GLbyte *);
 extern _X_HIDDEN void __glXDisp_Color4uiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color4uiv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord1sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_RasterPos3sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos3sv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_BindFramebufferEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BindFramebufferEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PushAttrib(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PushAttrib(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_DestroyPbuffer(struct __GLXclientStateRec *,
@@ -590,10 +560,6 @@ extern _X_HIDDEN int __glXDispSwap_DestroyPbuffer(struct __GLXclientStateRec *,
                                                   GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexParameteriv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexParameteriv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_WindowPos3fvMESA(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_WindowPos3fvMESA(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib1svNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib1svNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_QueryExtensionsString(struct __GLXclientStateRec
                                                      *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_QueryExtensionsString(struct
@@ -619,6 +585,8 @@ extern _X_HIDDEN int __glXDispSwap_CreateContext(struct __GLXclientStateRec *,
                                                  GLbyte *);
 extern _X_HIDDEN void __glXDisp_CopyColorTable(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyColorTable(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_PointParameterfv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_PointParameterfv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetHistogramParameterfv(struct
                                                        __GLXclientStateRec *,
                                                        GLbyte *);
@@ -643,15 +611,10 @@ extern _X_HIDDEN int __glXDispSwap_CreateGLXPixmap(struct __GLXclientStateRec *,
                                                    GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexEnvf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexEnvf(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramStringARB(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramStringARB(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord3ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib1dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib1dvARB(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GenProgramsARB(struct __GLXclientStateRec *,
+                                              GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GenProgramsARB(struct __GLXclientStateRec *,
+                                                  GLbyte *);
 extern _X_HIDDEN int __glXDisp_DeleteTextures(struct __GLXclientStateRec *,
                                               GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_DeleteTextures(struct __GLXclientStateRec *,
@@ -671,15 +634,10 @@ extern _X_HIDDEN int __glXDisp_QueryVersion(struct __GLXclientStateRec *,
                                             GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_QueryVersion(struct __GLXclientStateRec *,
                                                 GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetVertexAttribfvARB(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVertexAttribfvARB(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3ivEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3ivEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord4iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord4iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_FramebufferTexture3D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_FramebufferTexture3D(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetDrawableAttributesSGIX(struct
                                                          __GLXclientStateRec *,
                                                          GLbyte *);
@@ -688,69 +646,60 @@ extern _X_HIDDEN int __glXDispSwap_GetDrawableAttributesSGIX(struct
                                                              *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ColorTableParameteriv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ColorTableParameteriv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4ubvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4ubvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CopyTexImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyTexImage2D(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord2dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Lightfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Lightfv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetFramebufferAttachmentParameteriv(struct
+                                                                   __GLXclientStateRec
+                                                                   *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetFramebufferAttachmentParameteriv(struct
+                                                                       __GLXclientStateRec
+                                                                       *,
+                                                                       GLbyte
+                                                                       *);
 extern _X_HIDDEN void __glXDisp_ClearDepth(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ClearDepth(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ColorSubTable(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ColorSubTable(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color4fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color4fv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord4ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4ivARB(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_CreatePixmap(struct __GLXclientStateRec *,
                                             GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_CreatePixmap(struct __GLXclientStateRec *,
                                                 GLbyte *);
 extern _X_HIDDEN void __glXDisp_Lightiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Lightiv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetQueryObjectuivARB(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetQueryObjectuivARB(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
 extern _X_HIDDEN int __glXDisp_GetTexParameteriv(struct __GLXclientStateRec *,
                                                  GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetTexParameteriv(struct __GLXclientStateRec
                                                      *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GenRenderbuffersEXT(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GenRenderbuffersEXT(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttrib2dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib2dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttribs2svNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs2svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib3sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib3sv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_IsQuery(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_IsQuery(struct __GLXclientStateRec *,
+                                           GLbyte *);
 extern _X_HIDDEN void __glXDisp_Rectdv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Rectdv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4NivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4NivARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Materialiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Materialiv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_SampleMaskSGIS(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SampleMaskSGIS(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_SecondaryColor3fvEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_SecondaryColor3fvEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PolygonMode(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PolygonMode(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_CompressedTexSubImage1DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_CompressedTexSubImage1DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib2dvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib2dvNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetVertexAttribivNV(struct __GLXclientStateRec *,
+extern _X_HIDDEN void __glXDisp_SecondaryColor3iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4Niv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Niv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetProgramStringARB(struct __GLXclientStateRec *,
                                                    GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVertexAttribivNV(struct
+extern _X_HIDDEN int __glXDispSwap_GetProgramStringARB(struct
                                                        __GLXclientStateRec *,
                                                        GLbyte *);
-extern _X_HIDDEN int __glXDisp_IsQueryARB(struct __GLXclientStateRec *,
-                                          GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsQueryARB(struct __GLXclientStateRec *,
-                                              GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexGeni(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexGeni(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexGenf(GLbyte * pc);
@@ -763,23 +712,16 @@ extern _X_HIDDEN int __glXDispSwap_GetPolygonStipple(struct __GLXclientStateRec
                                                      *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_VertexAttrib2svNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib2svNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4NuivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4NuivARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetVertexAttribdvNV(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVertexAttribdvNV(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttribs1fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs1fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib2dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib2dvNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_DestroyWindow(struct __GLXclientStateRec *,
                                              GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_DestroyWindow(struct __GLXclientStateRec *,
                                                  GLbyte *);
 extern _X_HIDDEN void __glXDisp_Color4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color4sv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_IsProgramNV(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsProgramNV(struct __GLXclientStateRec *,
-                                               GLbyte *);
 extern _X_HIDDEN void __glXDisp_PixelZoom(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PixelZoom(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ColorTableParameterfv(GLbyte * pc);
@@ -796,23 +738,23 @@ extern _X_HIDDEN int __glXDisp_IsTextureEXT(struct __GLXclientStateRec *,
                                             GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_IsTextureEXT(struct __GLXclientStateRec *,
                                                 GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_BeginQuery(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BeginQuery(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_SetClientInfo2ARB(struct __GLXclientStateRec *,
                                                  GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_SetClientInfo2ARB(struct __GLXclientStateRec
                                                      *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_DeleteQueriesARB(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DeleteQueriesARB(struct __GLXclientStateRec
-                                                    *, GLbyte *);
 extern _X_HIDDEN int __glXDisp_GetMapdv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetMapdv(struct __GLXclientStateRec *,
                                             GLbyte *);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord3iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3iv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_DestroyGLXPixmap(struct __GLXclientStateRec *,
                                                 GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_DestroyGLXPixmap(struct __GLXclientStateRec
                                                     *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_SamplePatternSGIS(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SamplePatternSGIS(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_PixelStoref(struct __GLXclientStateRec *,
                                            GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_PixelStoref(struct __GLXclientStateRec *,
@@ -823,8 +765,6 @@ extern _X_HIDDEN int __glXDisp_PixelStorei(struct __GLXclientStateRec *,
                                            GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_PixelStorei(struct __GLXclientStateRec *,
                                                GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4usvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4usvARB(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_DestroyGLXPbufferSGIX(struct __GLXclientStateRec
                                                      *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_DestroyGLXPbufferSGIX(struct
@@ -832,21 +772,12 @@ extern _X_HIDDEN int __glXDispSwap_DestroyGLXPbufferSGIX(struct
                                                          GLbyte *);
 extern _X_HIDDEN void __glXDisp_EvalCoord2dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalCoord2dv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib3svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib3svARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ColorMaterial(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ColorMaterial(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_CompressedTexSubImage3DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_CompressedTexSubImage3DARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_IsFramebufferEXT(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsFramebufferEXT(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetVertexAttribdvARB(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVertexAttribdvARB(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttribs1svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs1svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib1fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib1fvNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetSeparableFilter(struct __GLXclientStateRec *,
                                                   GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetSeparableFilter(struct __GLXclientStateRec
@@ -856,8 +787,6 @@ extern _X_HIDDEN int __glXDisp_GetSeparableFilterEXT(struct __GLXclientStateRec
 extern _X_HIDDEN int __glXDispSwap_GetSeparableFilterEXT(struct
                                                          __GLXclientStateRec *,
                                                          GLbyte *);
-extern _X_HIDDEN void __glXDisp_RequestResidentProgramsNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_RequestResidentProgramsNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_FeedbackBuffer(struct __GLXclientStateRec *,
                                               GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_FeedbackBuffer(struct __GLXclientStateRec *,
@@ -872,12 +801,8 @@ extern _X_HIDDEN int __glXDisp_RenderLarge(struct __GLXclientStateRec *,
                                            GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_RenderLarge(struct __GLXclientStateRec *,
                                                GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4dvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PolygonOffset(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PolygonOffset(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_ExecuteProgramNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_ExecuteProgramNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Normal3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Normal3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Lightf(GLbyte * pc);
@@ -890,23 +815,22 @@ extern _X_HIDDEN int __glXDispSwap_GetPixelMapusv(struct __GLXclientStateRec *,
                                                   GLbyte *);
 extern _X_HIDDEN void __glXDisp_Lighti(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Lighti(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetFramebufferAttachmentParameterivEXT(struct
-                                                                      __GLXclientStateRec
-                                                                      *,
-                                                                      GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetFramebufferAttachmentParameterivEXT(struct
-                                                                          __GLXclientStateRec
-                                                                          *,
-                                                                          GLbyte
-                                                                          *);
+extern _X_HIDDEN int __glXDisp_GenFramebuffers(struct __GLXclientStateRec *,
+                                               GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GenFramebuffers(struct __GLXclientStateRec *,
+                                                   GLbyte *);
+extern _X_HIDDEN int __glXDisp_IsFramebuffer(struct __GLXclientStateRec *,
+                                             GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_IsFramebuffer(struct __GLXclientStateRec *,
+                                                 GLbyte *);
 extern _X_HIDDEN int __glXDisp_ChangeDrawableAttributesSGIX(struct
                                                             __GLXclientStateRec
                                                             *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_ChangeDrawableAttributesSGIX(struct
                                                                 __GLXclientStateRec
                                                                 *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord4dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4dvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_BlendEquationSeparate(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BlendEquationSeparate(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_CreatePbuffer(struct __GLXclientStateRec *,
                                              GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_CreatePbuffer(struct __GLXclientStateRec *,
@@ -919,12 +843,12 @@ extern _X_HIDDEN void __glXDisp_MultMatrixd(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MultMatrixd(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_MultMatrixf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MultMatrixf(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_CompressedTexImage1D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_CompressedTexImage1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_MultiTexCoord4fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_RasterPos4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos4sv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4NsvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4NsvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttrib3fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib3fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ClearColor(GLbyte * pc);
@@ -932,12 +856,20 @@ extern _X_HIDDEN void __glXDispSwap_ClearColor(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_IsDirect(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_IsDirect(struct __GLXclientStateRec *,
                                             GLbyte *);
-extern _X_HIDDEN void __glXDisp_DeleteFramebuffersEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_DeleteFramebuffersEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib1svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib1svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3ubv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3ubv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_PointParameteri(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_PointParameteri(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_PointParameterf(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_PointParameterf(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexEnviv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexEnviv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexSubImage3D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexSubImage3D(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4iv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_SwapIntervalSGI(struct __GLXclientStateRec *,
                                                GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_SwapIntervalSGI(struct __GLXclientStateRec *,
@@ -954,6 +886,8 @@ extern _X_HIDDEN int __glXDisp_GetColorTableParameterfvSGI(struct
 extern _X_HIDDEN int __glXDispSwap_GetColorTableParameterfvSGI(struct
                                                                __GLXclientStateRec
                                                                *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_FramebufferTexture2D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_FramebufferTexture2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Bitmap(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Bitmap(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetTexLevelParameterfv(struct __GLXclientStateRec
@@ -961,32 +895,25 @@ extern _X_HIDDEN int __glXDisp_GetTexLevelParameterfv(struct __GLXclientStateRec
 extern _X_HIDDEN int __glXDispSwap_GetTexLevelParameterfv(struct
                                                           __GLXclientStateRec *,
                                                           GLbyte *);
-extern _X_HIDDEN int __glXDisp_GenFramebuffersEXT(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GenFramebuffersEXT(struct __GLXclientStateRec
+extern _X_HIDDEN int __glXDisp_CheckFramebufferStatus(struct __GLXclientStateRec
                                                       *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetProgramParameterdvNV(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramParameterdvNV(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CheckFramebufferStatus(struct
+                                                          __GLXclientStateRec *,
+                                                          GLbyte *);
 extern _X_HIDDEN void __glXDisp_Vertex2sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex2sv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetIntegerv(struct __GLXclientStateRec *,
                                            GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetIntegerv(struct __GLXclientStateRec *,
                                                GLbyte *);
+extern _X_HIDDEN void __glXDisp_BindProgramARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BindProgramARB(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetProgramEnvParameterfvARB(struct
                                                            __GLXclientStateRec
                                                            *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetProgramEnvParameterfvARB(struct
                                                                __GLXclientStateRec
                                                                *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetTrackMatrixivNV(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTrackMatrixivNV(struct __GLXclientStateRec
-                                                      *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_VertexAttrib3svNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib3svNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetTexEnviv(struct __GLXclientStateRec *,
@@ -1000,20 +927,16 @@ extern _X_HIDDEN int __glXDispSwap_VendorPrivateWithReply(struct
                                                           GLbyte *);
 extern _X_HIDDEN void __glXDisp_SeparableFilter2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_SeparableFilter2D(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetQueryObjectuiv(struct __GLXclientStateRec *,
+                                                 GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetQueryObjectuiv(struct __GLXclientStateRec
+                                                     *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Map1d(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Map1d(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Map1f(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Map1f(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_CompressedTexImage2DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_CompressedTexImage2DARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexImage2D(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_ProgramParameters4fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_ProgramParameters4fvNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramivNV(struct __GLXclientStateRec *,
-                                              GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramivNV(struct __GLXclientStateRec *,
-                                                  GLbyte *);
 extern _X_HIDDEN int __glXDisp_ChangeDrawableAttributes(struct
                                                         __GLXclientStateRec *,
                                                         GLbyte *);
@@ -1039,12 +962,12 @@ extern _X_HIDDEN void __glXDisp_RasterPos2dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos2dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Fogiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Fogiv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_EndQuery(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_EndQuery(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord1dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord1dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PixelTransferi(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PixelTransferi(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3ubvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3ubvEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttrib3fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib3fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Clear(GLbyte * pc);
@@ -1053,6 +976,8 @@ extern _X_HIDDEN void __glXDisp_ReadBuffer(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ReadBuffer(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ConvolutionParameteri(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ConvolutionParameteri(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_LightModeli(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LightModeli(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ListBase(GLbyte * pc);
@@ -1077,18 +1002,20 @@ extern _X_HIDDEN int __glXDispSwap_ReleaseTexImageEXT(struct __GLXclientStateRec
                                                       *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_CallList(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CallList(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttribs2fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs2fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_GenerateMipmap(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_GenerateMipmap(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Rectiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Rectiv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3dvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3dvEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord1iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex2fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex2fv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_BindRenderbufferEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BindRenderbufferEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex3sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex3sv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetQueryObjectiv(struct __GLXclientStateRec *,
+                                                GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetQueryObjectiv(struct __GLXclientStateRec
+                                                    *, GLbyte *);
 extern _X_HIDDEN int __glXDisp_SetClientInfoARB(struct __GLXclientStateRec *,
                                                 GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_SetClientInfoARB(struct __GLXclientStateRec
@@ -1099,26 +1026,14 @@ extern _X_HIDDEN int __glXDispSwap_BindTexImageEXT(struct __GLXclientStateRec *,
                                                    GLbyte *);
 extern _X_HIDDEN void __glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ProgramLocalParameter4fvARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_DeleteProgramsNV(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DeleteProgramsNV(struct __GLXclientStateRec
-                                                    *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_EvalMesh1(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalMesh1(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttribs1fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs1fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord1dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1dvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_CompressedTexSubImage3D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_CompressedTexSubImage3D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex2iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex2iv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramStringNV(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramStringNV(struct __GLXclientStateRec
-                                                      *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_LineWidth(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LineWidth(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib2fvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib2fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexGendv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexGendv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ResetMinmax(GLbyte * pc);
@@ -1135,12 +1050,16 @@ extern _X_HIDDEN int __glXDisp_GetConvolutionParameterfvEXT(struct
 extern _X_HIDDEN int __glXDispSwap_GetConvolutionParameterfvEXT(struct
                                                                 __GLXclientStateRec
                                                                 *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttribs4dvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs4dvNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetMaterialfv(struct __GLXclientStateRec *,
                                              GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetMaterialfv(struct __GLXclientStateRec *,
                                                  GLbyte *);
+extern _X_HIDDEN void __glXDisp_WindowPos3fv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_WindowPos3fv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_DeleteProgramsARB(struct __GLXclientStateRec *,
+                                                 GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DeleteProgramsARB(struct __GLXclientStateRec
+                                                     *, GLbyte *);
 extern _X_HIDDEN int __glXDisp_UseXFont(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_UseXFont(struct __GLXclientStateRec *,
                                             GLbyte *);
@@ -1152,14 +1071,14 @@ extern _X_HIDDEN void __glXDisp_TexCoord3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_FogCoordfvEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_FogCoordfvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord1ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord2ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2ivARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_DrawArrays(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_DrawArrays(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SampleCoverage(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SampleCoverage(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color3iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4ubv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4ubv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetProgramLocalParameterdvARB(struct
                                                              __GLXclientStateRec
                                                              *, GLbyte *);
@@ -1178,22 +1097,24 @@ extern _X_HIDDEN int __glXDisp_GetHistogramParameterivEXT(struct
 extern _X_HIDDEN int __glXDispSwap_GetHistogramParameterivEXT(struct
                                                               __GLXclientStateRec
                                                               *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_PointParameteriv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_PointParameteriv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Rotatef(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Rotatef(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetProgramivARB(struct __GLXclientStateRec *,
                                                GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetProgramivARB(struct __GLXclientStateRec *,
                                                    GLbyte *);
-extern _X_HIDDEN void __glXDisp_BlendFuncSeparateEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BlendFuncSeparateEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_ProgramParameters4dvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_BindRenderbuffer(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BindRenderbuffer(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_EvalPoint2(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalPoint2(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_EvalPoint1(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalPoint1(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PopMatrix(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PopMatrix(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_DeleteFramebuffers(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_DeleteFramebuffers(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_MakeCurrentReadSGI(struct __GLXclientStateRec *,
                                                   GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_MakeCurrentReadSGI(struct __GLXclientStateRec
@@ -1206,12 +1127,24 @@ extern _X_HIDDEN int __glXDisp_MakeCurrent(struct __GLXclientStateRec *,
                                            GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_MakeCurrent(struct __GLXclientStateRec *,
                                                GLbyte *);
+extern _X_HIDDEN void __glXDisp_FramebufferRenderbuffer(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_FramebufferRenderbuffer(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_IsProgramARB(struct __GLXclientStateRec *,
+                                            GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_IsProgramARB(struct __GLXclientStateRec *,
+                                                GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4uiv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4uiv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4Nsv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Nsv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Map2d(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Map2d(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Map2f(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Map2f(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ProgramStringARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ProgramStringARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4bv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4bv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetConvolutionFilter(struct __GLXclientStateRec
                                                     *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetConvolutionFilter(struct
@@ -1223,12 +1156,8 @@ extern _X_HIDDEN int __glXDisp_GetConvolutionFilterEXT(struct
 extern _X_HIDDEN int __glXDispSwap_GetConvolutionFilterEXT(struct
                                                            __GLXclientStateRec
                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetCompressedTexImageARB(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetCompressedTexImageARB(struct
-                                                            __GLXclientStateRec
-                                                            *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttribs4dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs4dvNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetTexGenfv(struct __GLXclientStateRec *,
                                            GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetTexGenfv(struct __GLXclientStateRec *,
@@ -1249,16 +1178,12 @@ extern _X_HIDDEN void __glXDisp_Materiali(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Materiali(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Indexsv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Indexsv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord4svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4svARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib1fvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib1fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_LightModelfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LightModelfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord2dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord2dv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GenQueriesARB(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GenQueriesARB(struct __GLXclientStateRec *,
-                                                 GLbyte *);
 extern _X_HIDDEN void __glXDisp_EvalCoord1dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalCoord1dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Translated(GLbyte * pc);
@@ -1267,8 +1192,6 @@ extern _X_HIDDEN void __glXDisp_Translatef(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Translatef(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_StencilMask(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_StencilMask(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_ClampColorARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_ClampColorARB(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_CreateWindow(struct __GLXclientStateRec *,
                                             GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_CreateWindow(struct __GLXclientStateRec *,
@@ -1284,8 +1207,6 @@ extern _X_HIDDEN int __glXDisp_RenderMode(struct __GLXclientStateRec *,
                                           GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_RenderMode(struct __GLXclientStateRec *,
                                               GLbyte *);
-extern _X_HIDDEN void __glXDisp_DrawBuffersARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_DrawBuffersARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_LoadName(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LoadName(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CopyTexSubImage1D(GLbyte * pc);
@@ -1297,8 +1218,8 @@ extern _X_HIDDEN int __glXDisp_QueryContextInfoEXT(struct __GLXclientStateRec *,
 extern _X_HIDDEN int __glXDispSwap_QueryContextInfoEXT(struct
                                                        __GLXclientStateRec *,
                                                        GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttribs3svNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs3svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttribs2fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs2fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_StencilFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_StencilFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CopyPixels(GLbyte * pc);
@@ -1309,12 +1230,14 @@ extern _X_HIDDEN void __glXDisp_CopyConvolutionFilter2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyConvolutionFilter2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexParameterfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexParameterfv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4uivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4uivARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4Nubv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Nubv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ClipPlane(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ClipPlane(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_TrackMatrixNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_TrackMatrixNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3usv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3usv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord3dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3dv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetPixelMapuiv(struct __GLXclientStateRec *,
                                               GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetPixelMapuiv(struct __GLXclientStateRec *,
@@ -1325,22 +1248,20 @@ extern _X_HIDDEN int __glXDisp_QueryContext(struct __GLXclientStateRec *,
                                             GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_QueryContext(struct __GLXclientStateRec *,
                                                 GLbyte *);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3svEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3svEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_MultiTexCoord3fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3fvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_BlitFramebuffer(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BlitFramebuffer(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_IndexMask(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_IndexMask(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_BindProgramNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BindProgramNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4svARB(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetFloatv(struct __GLXclientStateRec *,
                                          GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetFloatv(struct __GLXclientStateRec *,
                                              GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexCoord3sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord3sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_FogCoorddv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_FogCoorddv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PopAttrib(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PopAttrib(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Fogfv(GLbyte * pc);
@@ -1351,8 +1272,10 @@ extern _X_HIDDEN void __glXDisp_Normal3sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Normal3sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Minmax(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Minmax(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_FogCoorddvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_FogCoorddvEXT(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_DeleteQueries(struct __GLXclientStateRec *,
+                                             GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DeleteQueries(struct __GLXclientStateRec *,
+                                                 GLbyte *);
 extern _X_HIDDEN int __glXDisp_GetBooleanv(struct __GLXclientStateRec *,
                                            GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetBooleanv(struct __GLXclientStateRec *,
@@ -1361,29 +1284,12 @@ extern _X_HIDDEN void __glXDisp_Hint(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Hint(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color4dv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib2svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib2svARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_AreProgramsResidentNV(struct __GLXclientStateRec
-                                                     *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_AreProgramsResidentNV(struct
-                                                         __GLXclientStateRec *,
-                                                         GLbyte *);
 extern _X_HIDDEN void __glXDisp_CopyColorSubTable(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyColorSubTable(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_DeleteRenderbuffersEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_DeleteRenderbuffersEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4NubvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4NubvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttrib3dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib3dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex4iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex4iv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramEnvParameterdvARB(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramEnvParameterdvARB(struct
-                                                               __GLXclientStateRec
-                                                               *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexCoord4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Begin(GLbyte * pc);
@@ -1408,12 +1314,6 @@ extern _X_HIDDEN void __glXDisp_Disable(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Disable(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_MultiTexCoord2fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2fvARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetRenderbufferParameterivEXT(struct
-                                                             __GLXclientStateRec
-                                                             *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetRenderbufferParameterivEXT(struct
-                                                                 __GLXclientStateRec
-                                                                 *, GLbyte *);
 extern _X_HIDDEN int __glXDisp_SelectBuffer(struct __GLXclientStateRec *,
                                             GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_SelectBuffer(struct __GLXclientStateRec *,
@@ -1424,8 +1324,18 @@ extern _X_HIDDEN void __glXDisp_RasterPos4iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos4iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Enable(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Enable(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetRenderbufferParameteriv(struct
+                                                          __GLXclientStateRec *,
+                                                          GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetRenderbufferParameteriv(struct
+                                                              __GLXclientStateRec
+                                                              *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_VertexAttribs4svNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttribs4svNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GenRenderbuffers(struct __GLXclientStateRec *,
+                                                GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GenRenderbuffers(struct __GLXclientStateRec
+                                                    *, GLbyte *);
 extern _X_HIDDEN int __glXDisp_GetMinmaxParameterfv(struct __GLXclientStateRec
                                                     *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetMinmaxParameterfv(struct
@@ -1437,21 +1347,13 @@ extern _X_HIDDEN int __glXDisp_GetMinmaxParameterfvEXT(struct
 extern _X_HIDDEN int __glXDispSwap_GetMinmaxParameterfvEXT(struct
                                                            __GLXclientStateRec
                                                            *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttrib1fvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib1fvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttribs1svNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs1svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4Nuiv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Nuiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex3fv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_IsRenderbufferEXT(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsRenderbufferEXT(struct __GLXclientStateRec
-                                                     *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GenProgramsNV(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GenProgramsNV(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4dvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord2sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2sv(GLbyte * pc);
 
 #endif                          /* !defined( _INDIRECT_DISPATCH_H_ ) */
diff --git a/xorg-server/glx/indirect_dispatch_swap.c b/xorg-server/glx/indirect_dispatch_swap.c
index 80010b3f7..974751461 100644
--- a/xorg-server/glx/indirect_dispatch_swap.c
+++ b/xorg-server/glx/indirect_dispatch_swap.c
@@ -25,21 +25,14 @@
  * SOFTWARE.
  */
 
-#include <X11/Xmd.h>
-#include <GL/gl.h>
-#include <GL/glxproto.h>
 #include <inttypes.h>
+#include "glxserver.h"
 #include "indirect_size.h"
 #include "indirect_size_get.h"
 #include "indirect_dispatch.h"
-#include "glxserver.h"
 #include "glxbyteorder.h"
 #include "indirect_util.h"
 #include "singlesize.h"
-#include "glapi.h"
-#include "glapitable.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 #define __GLX_PAD(x)  (((x) + 3) & ~3)
 
@@ -176,9 +169,7 @@ __glXDispSwap_NewList(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        CALL_NewList(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                      (GLenum) bswap_ENUM(pc + 4)
-                     ));
+        glNewList((GLuint) bswap_CARD32(pc + 0), (GLenum) bswap_ENUM(pc + 4));
         error = Success;
     }
 
@@ -195,7 +186,7 @@ __glXDispSwap_EndList(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        CALL_EndList(GET_DISPATCH(), ());
+        glEndList();
         error = Success;
     }
 
@@ -205,8 +196,7 @@ __glXDispSwap_EndList(__GLXclientState * cl, GLbyte * pc)
 void
 __glXDispSwap_CallList(GLbyte * pc)
 {
-    CALL_CallList(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                  ));
+    glCallList((GLuint) bswap_CARD32(pc + 0));
 }
 
 void
@@ -237,7 +227,7 @@ __glXDispSwap_CallLists(GLbyte * pc)
         return;
     }
 
-    CALL_CallLists(GET_DISPATCH(), (n, type, lists));
+    glCallLists(n, type, lists);
 }
 
 int
@@ -250,9 +240,8 @@ __glXDispSwap_DeleteLists(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        CALL_DeleteLists(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                          (GLsizei) bswap_CARD32(pc + 4)
-                         ));
+        glDeleteLists((GLuint) bswap_CARD32(pc + 0),
+                      (GLsizei) bswap_CARD32(pc + 4));
         error = Success;
     }
 
@@ -271,8 +260,7 @@ __glXDispSwap_GenLists(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLuint retval;
 
-        retval = CALL_GenLists(GET_DISPATCH(), ((GLsizei) bswap_CARD32(pc + 0)
-                               ));
+        retval = glGenLists((GLsizei) bswap_CARD32(pc + 0));
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -283,15 +271,13 @@ __glXDispSwap_GenLists(__GLXclientState * cl, GLbyte * pc)
 void
 __glXDispSwap_ListBase(GLbyte * pc)
 {
-    CALL_ListBase(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                  ));
+    glListBase((GLuint) bswap_CARD32(pc + 0));
 }
 
 void
 __glXDispSwap_Begin(GLbyte * pc)
 {
-    CALL_Begin(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-               ));
+    glBegin((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
@@ -300,33 +286,25 @@ __glXDispSwap_Bitmap(GLbyte * pc)
     const GLubyte *const bitmap = (const GLubyte *) ((pc + 44));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_Bitmap(GET_DISPATCH(), ((GLsizei) bswap_CARD32(pc + 20),
-                                 (GLsizei) bswap_CARD32(pc + 24),
-                                 (GLfloat) bswap_FLOAT32(pc + 28),
-                                 (GLfloat) bswap_FLOAT32(pc + 32),
-                                 (GLfloat) bswap_FLOAT32(pc + 36),
-                                 (GLfloat) bswap_FLOAT32(pc + 40), bitmap));
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
+
+    glBitmap((GLsizei) bswap_CARD32(pc + 20),
+             (GLsizei) bswap_CARD32(pc + 24),
+             (GLfloat) bswap_FLOAT32(pc + 28),
+             (GLfloat) bswap_FLOAT32(pc + 32),
+             (GLfloat) bswap_FLOAT32(pc + 36),
+             (GLfloat) bswap_FLOAT32(pc + 40), bitmap);
 }
 
 void
 __glXDispSwap_Color3bv(GLbyte * pc)
 {
-    CALL_Color3bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                  ));
+    glColor3bv((const GLbyte *) (pc + 0));
 }
 
 void
@@ -339,63 +317,49 @@ __glXDispSwap_Color3dv(GLbyte * pc)
     }
 #endif
 
-    CALL_Color3dv(GET_DISPATCH(), ((const GLdouble *)
-                                   bswap_64_array((uint64_t *) (pc + 0), 3)
-                  ));
+    glColor3dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_Color3fv(GLbyte * pc)
 {
-    CALL_Color3fv(GET_DISPATCH(), ((const GLfloat *)
-                                   bswap_32_array((uint32_t *) (pc + 0), 3)
-                  ));
+    glColor3fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_Color3iv(GLbyte * pc)
 {
-    CALL_Color3iv(GET_DISPATCH(), ((const GLint *)
-                                   bswap_32_array((uint32_t *) (pc + 0), 3)
-                  ));
+    glColor3iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_Color3sv(GLbyte * pc)
 {
-    CALL_Color3sv(GET_DISPATCH(), ((const GLshort *)
-                                   bswap_16_array((uint16_t *) (pc + 0), 3)
-                  ));
+    glColor3sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_Color3ubv(GLbyte * pc)
 {
-    CALL_Color3ubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                   ));
+    glColor3ubv((const GLubyte *) (pc + 0));
 }
 
 void
 __glXDispSwap_Color3uiv(GLbyte * pc)
 {
-    CALL_Color3uiv(GET_DISPATCH(), ((const GLuint *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 3)
-                   ));
+    glColor3uiv((const GLuint *) bswap_32_array((uint32_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_Color3usv(GLbyte * pc)
 {
-    CALL_Color3usv(GET_DISPATCH(), ((const GLushort *)
-                                    bswap_16_array((uint16_t *) (pc + 0), 3)
-                   ));
+    glColor3usv((const GLushort *) bswap_16_array((uint16_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_Color4bv(GLbyte * pc)
 {
-    CALL_Color4bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                  ));
+    glColor4bv((const GLbyte *) (pc + 0));
 }
 
 void
@@ -408,69 +372,55 @@ __glXDispSwap_Color4dv(GLbyte * pc)
     }
 #endif
 
-    CALL_Color4dv(GET_DISPATCH(), ((const GLdouble *)
-                                   bswap_64_array((uint64_t *) (pc + 0), 4)
-                  ));
+    glColor4dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_Color4fv(GLbyte * pc)
 {
-    CALL_Color4fv(GET_DISPATCH(), ((const GLfloat *)
-                                   bswap_32_array((uint32_t *) (pc + 0), 4)
-                  ));
+    glColor4fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_Color4iv(GLbyte * pc)
 {
-    CALL_Color4iv(GET_DISPATCH(), ((const GLint *)
-                                   bswap_32_array((uint32_t *) (pc + 0), 4)
-                  ));
+    glColor4iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_Color4sv(GLbyte * pc)
 {
-    CALL_Color4sv(GET_DISPATCH(), ((const GLshort *)
-                                   bswap_16_array((uint16_t *) (pc + 0), 4)
-                  ));
+    glColor4sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_Color4ubv(GLbyte * pc)
 {
-    CALL_Color4ubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                   ));
+    glColor4ubv((const GLubyte *) (pc + 0));
 }
 
 void
 __glXDispSwap_Color4uiv(GLbyte * pc)
 {
-    CALL_Color4uiv(GET_DISPATCH(), ((const GLuint *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 4)
-                   ));
+    glColor4uiv((const GLuint *) bswap_32_array((uint32_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_Color4usv(GLbyte * pc)
 {
-    CALL_Color4usv(GET_DISPATCH(), ((const GLushort *)
-                                    bswap_16_array((uint16_t *) (pc + 0), 4)
-                   ));
+    glColor4usv((const GLushort *) bswap_16_array((uint16_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_EdgeFlagv(GLbyte * pc)
 {
-    CALL_EdgeFlagv(GET_DISPATCH(), ((const GLboolean *) (pc + 0)
-                   ));
+    glEdgeFlagv((const GLboolean *) (pc + 0));
 }
 
 void
 __glXDispSwap_End(GLbyte * pc)
 {
-    CALL_End(GET_DISPATCH(), ());
+    glEnd();
 }
 
 void
@@ -483,40 +433,31 @@ __glXDispSwap_Indexdv(GLbyte * pc)
     }
 #endif
 
-    CALL_Indexdv(GET_DISPATCH(), ((const GLdouble *)
-                                  bswap_64_array((uint64_t *) (pc + 0), 1)
-                 ));
+    glIndexdv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 1));
 }
 
 void
 __glXDispSwap_Indexfv(GLbyte * pc)
 {
-    CALL_Indexfv(GET_DISPATCH(), ((const GLfloat *)
-                                  bswap_32_array((uint32_t *) (pc + 0), 1)
-                 ));
+    glIndexfv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 1));
 }
 
 void
 __glXDispSwap_Indexiv(GLbyte * pc)
 {
-    CALL_Indexiv(GET_DISPATCH(), ((const GLint *)
-                                  bswap_32_array((uint32_t *) (pc + 0), 1)
-                 ));
+    glIndexiv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 1));
 }
 
 void
 __glXDispSwap_Indexsv(GLbyte * pc)
 {
-    CALL_Indexsv(GET_DISPATCH(), ((const GLshort *)
-                                  bswap_16_array((uint16_t *) (pc + 0), 1)
-                 ));
+    glIndexsv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 1));
 }
 
 void
 __glXDispSwap_Normal3bv(GLbyte * pc)
 {
-    CALL_Normal3bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                   ));
+    glNormal3bv((const GLbyte *) (pc + 0));
 }
 
 void
@@ -529,33 +470,25 @@ __glXDispSwap_Normal3dv(GLbyte * pc)
     }
 #endif
 
-    CALL_Normal3dv(GET_DISPATCH(), ((const GLdouble *)
-                                    bswap_64_array((uint64_t *) (pc + 0), 3)
-                   ));
+    glNormal3dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_Normal3fv(GLbyte * pc)
 {
-    CALL_Normal3fv(GET_DISPATCH(), ((const GLfloat *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 3)
-                   ));
+    glNormal3fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_Normal3iv(GLbyte * pc)
 {
-    CALL_Normal3iv(GET_DISPATCH(), ((const GLint *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 3)
-                   ));
+    glNormal3iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_Normal3sv(GLbyte * pc)
 {
-    CALL_Normal3sv(GET_DISPATCH(), ((const GLshort *)
-                                    bswap_16_array((uint16_t *) (pc + 0), 3)
-                   ));
+    glNormal3sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 3));
 }
 
 void
@@ -568,33 +501,25 @@ __glXDispSwap_RasterPos2dv(GLbyte * pc)
     }
 #endif
 
-    CALL_RasterPos2dv(GET_DISPATCH(), ((const GLdouble *)
-                                       bswap_64_array((uint64_t *) (pc + 0), 2)
-                      ));
+    glRasterPos2dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 2));
 }
 
 void
 __glXDispSwap_RasterPos2fv(GLbyte * pc)
 {
-    CALL_RasterPos2fv(GET_DISPATCH(), ((const GLfloat *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 2)
-                      ));
+    glRasterPos2fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 2));
 }
 
 void
 __glXDispSwap_RasterPos2iv(GLbyte * pc)
 {
-    CALL_RasterPos2iv(GET_DISPATCH(), ((const GLint *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 2)
-                      ));
+    glRasterPos2iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 2));
 }
 
 void
 __glXDispSwap_RasterPos2sv(GLbyte * pc)
 {
-    CALL_RasterPos2sv(GET_DISPATCH(), ((const GLshort *)
-                                       bswap_16_array((uint16_t *) (pc + 0), 2)
-                      ));
+    glRasterPos2sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 2));
 }
 
 void
@@ -607,33 +532,25 @@ __glXDispSwap_RasterPos3dv(GLbyte * pc)
     }
 #endif
 
-    CALL_RasterPos3dv(GET_DISPATCH(), ((const GLdouble *)
-                                       bswap_64_array((uint64_t *) (pc + 0), 3)
-                      ));
+    glRasterPos3dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_RasterPos3fv(GLbyte * pc)
 {
-    CALL_RasterPos3fv(GET_DISPATCH(), ((const GLfloat *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 3)
-                      ));
+    glRasterPos3fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_RasterPos3iv(GLbyte * pc)
 {
-    CALL_RasterPos3iv(GET_DISPATCH(), ((const GLint *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 3)
-                      ));
+    glRasterPos3iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_RasterPos3sv(GLbyte * pc)
 {
-    CALL_RasterPos3sv(GET_DISPATCH(), ((const GLshort *)
-                                       bswap_16_array((uint16_t *) (pc + 0), 3)
-                      ));
+    glRasterPos3sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 3));
 }
 
 void
@@ -646,33 +563,25 @@ __glXDispSwap_RasterPos4dv(GLbyte * pc)
     }
 #endif
 
-    CALL_RasterPos4dv(GET_DISPATCH(), ((const GLdouble *)
-                                       bswap_64_array((uint64_t *) (pc + 0), 4)
-                      ));
+    glRasterPos4dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_RasterPos4fv(GLbyte * pc)
 {
-    CALL_RasterPos4fv(GET_DISPATCH(), ((const GLfloat *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 4)
-                      ));
+    glRasterPos4fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_RasterPos4iv(GLbyte * pc)
 {
-    CALL_RasterPos4iv(GET_DISPATCH(), ((const GLint *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 4)
-                      ));
+    glRasterPos4iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_RasterPos4sv(GLbyte * pc)
 {
-    CALL_RasterPos4sv(GET_DISPATCH(), ((const GLshort *)
-                                       bswap_16_array((uint16_t *) (pc + 0), 4)
-                      ));
+    glRasterPos4sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 4));
 }
 
 void
@@ -685,41 +594,29 @@ __glXDispSwap_Rectdv(GLbyte * pc)
     }
 #endif
 
-    CALL_Rectdv(GET_DISPATCH(), ((const GLdouble *)
-                                 bswap_64_array((uint64_t *) (pc + 0), 2),
-                                 (const GLdouble *)
-                                 bswap_64_array((uint64_t *) (pc + 16), 2)
-                ));
+    glRectdv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 2),
+             (const GLdouble *) bswap_64_array((uint64_t *) (pc + 16), 2));
 }
 
 void
 __glXDispSwap_Rectfv(GLbyte * pc)
 {
-    CALL_Rectfv(GET_DISPATCH(), ((const GLfloat *)
-                                 bswap_32_array((uint32_t *) (pc + 0), 2),
-                                 (const GLfloat *)
-                                 bswap_32_array((uint32_t *) (pc + 8), 2)
-                ));
+    glRectfv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 2),
+             (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8), 2));
 }
 
 void
 __glXDispSwap_Rectiv(GLbyte * pc)
 {
-    CALL_Rectiv(GET_DISPATCH(), ((const GLint *)
-                                 bswap_32_array((uint32_t *) (pc + 0), 2),
-                                 (const GLint *)
-                                 bswap_32_array((uint32_t *) (pc + 8), 2)
-                ));
+    glRectiv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 2),
+             (const GLint *) bswap_32_array((uint32_t *) (pc + 8), 2));
 }
 
 void
 __glXDispSwap_Rectsv(GLbyte * pc)
 {
-    CALL_Rectsv(GET_DISPATCH(), ((const GLshort *)
-                                 bswap_16_array((uint16_t *) (pc + 0), 2),
-                                 (const GLshort *)
-                                 bswap_16_array((uint16_t *) (pc + 4), 2)
-                ));
+    glRectsv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 2),
+             (const GLshort *) bswap_16_array((uint16_t *) (pc + 4), 2));
 }
 
 void
@@ -732,33 +629,25 @@ __glXDispSwap_TexCoord1dv(GLbyte * pc)
     }
 #endif
 
-    CALL_TexCoord1dv(GET_DISPATCH(), ((const GLdouble *)
-                                      bswap_64_array((uint64_t *) (pc + 0), 1)
-                     ));
+    glTexCoord1dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 1));
 }
 
 void
 __glXDispSwap_TexCoord1fv(GLbyte * pc)
 {
-    CALL_TexCoord1fv(GET_DISPATCH(), ((const GLfloat *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 1)
-                     ));
+    glTexCoord1fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 1));
 }
 
 void
 __glXDispSwap_TexCoord1iv(GLbyte * pc)
 {
-    CALL_TexCoord1iv(GET_DISPATCH(), ((const GLint *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 1)
-                     ));
+    glTexCoord1iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 1));
 }
 
 void
 __glXDispSwap_TexCoord1sv(GLbyte * pc)
 {
-    CALL_TexCoord1sv(GET_DISPATCH(), ((const GLshort *)
-                                      bswap_16_array((uint16_t *) (pc + 0), 1)
-                     ));
+    glTexCoord1sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 1));
 }
 
 void
@@ -771,33 +660,25 @@ __glXDispSwap_TexCoord2dv(GLbyte * pc)
     }
 #endif
 
-    CALL_TexCoord2dv(GET_DISPATCH(), ((const GLdouble *)
-                                      bswap_64_array((uint64_t *) (pc + 0), 2)
-                     ));
+    glTexCoord2dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 2));
 }
 
 void
 __glXDispSwap_TexCoord2fv(GLbyte * pc)
 {
-    CALL_TexCoord2fv(GET_DISPATCH(), ((const GLfloat *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 2)
-                     ));
+    glTexCoord2fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 2));
 }
 
 void
 __glXDispSwap_TexCoord2iv(GLbyte * pc)
 {
-    CALL_TexCoord2iv(GET_DISPATCH(), ((const GLint *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 2)
-                     ));
+    glTexCoord2iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 2));
 }
 
 void
 __glXDispSwap_TexCoord2sv(GLbyte * pc)
 {
-    CALL_TexCoord2sv(GET_DISPATCH(), ((const GLshort *)
-                                      bswap_16_array((uint16_t *) (pc + 0), 2)
-                     ));
+    glTexCoord2sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 2));
 }
 
 void
@@ -810,33 +691,25 @@ __glXDispSwap_TexCoord3dv(GLbyte * pc)
     }
 #endif
 
-    CALL_TexCoord3dv(GET_DISPATCH(), ((const GLdouble *)
-                                      bswap_64_array((uint64_t *) (pc + 0), 3)
-                     ));
+    glTexCoord3dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_TexCoord3fv(GLbyte * pc)
 {
-    CALL_TexCoord3fv(GET_DISPATCH(), ((const GLfloat *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 3)
-                     ));
+    glTexCoord3fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_TexCoord3iv(GLbyte * pc)
 {
-    CALL_TexCoord3iv(GET_DISPATCH(), ((const GLint *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 3)
-                     ));
+    glTexCoord3iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_TexCoord3sv(GLbyte * pc)
 {
-    CALL_TexCoord3sv(GET_DISPATCH(), ((const GLshort *)
-                                      bswap_16_array((uint16_t *) (pc + 0), 3)
-                     ));
+    glTexCoord3sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 3));
 }
 
 void
@@ -849,33 +722,25 @@ __glXDispSwap_TexCoord4dv(GLbyte * pc)
     }
 #endif
 
-    CALL_TexCoord4dv(GET_DISPATCH(), ((const GLdouble *)
-                                      bswap_64_array((uint64_t *) (pc + 0), 4)
-                     ));
+    glTexCoord4dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_TexCoord4fv(GLbyte * pc)
 {
-    CALL_TexCoord4fv(GET_DISPATCH(), ((const GLfloat *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 4)
-                     ));
+    glTexCoord4fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_TexCoord4iv(GLbyte * pc)
 {
-    CALL_TexCoord4iv(GET_DISPATCH(), ((const GLint *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 4)
-                     ));
+    glTexCoord4iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_TexCoord4sv(GLbyte * pc)
 {
-    CALL_TexCoord4sv(GET_DISPATCH(), ((const GLshort *)
-                                      bswap_16_array((uint16_t *) (pc + 0), 4)
-                     ));
+    glTexCoord4sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 4));
 }
 
 void
@@ -888,33 +753,25 @@ __glXDispSwap_Vertex2dv(GLbyte * pc)
     }
 #endif
 
-    CALL_Vertex2dv(GET_DISPATCH(), ((const GLdouble *)
-                                    bswap_64_array((uint64_t *) (pc + 0), 2)
-                   ));
+    glVertex2dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 2));
 }
 
 void
 __glXDispSwap_Vertex2fv(GLbyte * pc)
 {
-    CALL_Vertex2fv(GET_DISPATCH(), ((const GLfloat *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 2)
-                   ));
+    glVertex2fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 2));
 }
 
 void
 __glXDispSwap_Vertex2iv(GLbyte * pc)
 {
-    CALL_Vertex2iv(GET_DISPATCH(), ((const GLint *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 2)
-                   ));
+    glVertex2iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 2));
 }
 
 void
 __glXDispSwap_Vertex2sv(GLbyte * pc)
 {
-    CALL_Vertex2sv(GET_DISPATCH(), ((const GLshort *)
-                                    bswap_16_array((uint16_t *) (pc + 0), 2)
-                   ));
+    glVertex2sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 2));
 }
 
 void
@@ -927,33 +784,25 @@ __glXDispSwap_Vertex3dv(GLbyte * pc)
     }
 #endif
 
-    CALL_Vertex3dv(GET_DISPATCH(), ((const GLdouble *)
-                                    bswap_64_array((uint64_t *) (pc + 0), 3)
-                   ));
+    glVertex3dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_Vertex3fv(GLbyte * pc)
 {
-    CALL_Vertex3fv(GET_DISPATCH(), ((const GLfloat *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 3)
-                   ));
+    glVertex3fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_Vertex3iv(GLbyte * pc)
 {
-    CALL_Vertex3iv(GET_DISPATCH(), ((const GLint *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 3)
-                   ));
+    glVertex3iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 3));
 }
 
 void
 __glXDispSwap_Vertex3sv(GLbyte * pc)
 {
-    CALL_Vertex3sv(GET_DISPATCH(), ((const GLshort *)
-                                    bswap_16_array((uint16_t *) (pc + 0), 3)
-                   ));
+    glVertex3sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 3));
 }
 
 void
@@ -966,33 +815,25 @@ __glXDispSwap_Vertex4dv(GLbyte * pc)
     }
 #endif
 
-    CALL_Vertex4dv(GET_DISPATCH(), ((const GLdouble *)
-                                    bswap_64_array((uint64_t *) (pc + 0), 4)
-                   ));
+    glVertex4dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_Vertex4fv(GLbyte * pc)
 {
-    CALL_Vertex4fv(GET_DISPATCH(), ((const GLfloat *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 4)
-                   ));
+    glVertex4fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_Vertex4iv(GLbyte * pc)
 {
-    CALL_Vertex4iv(GET_DISPATCH(), ((const GLint *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 4)
-                   ));
+    glVertex4iv((const GLint *) bswap_32_array((uint32_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_Vertex4sv(GLbyte * pc)
 {
-    CALL_Vertex4sv(GET_DISPATCH(), ((const GLshort *)
-                                    bswap_16_array((uint16_t *) (pc + 0), 4)
-                   ));
+    glVertex4sv((const GLshort *) bswap_16_array((uint16_t *) (pc + 0), 4));
 }
 
 void
@@ -1005,33 +846,26 @@ __glXDispSwap_ClipPlane(GLbyte * pc)
     }
 #endif
 
-    CALL_ClipPlane(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 32),
-                                    (const GLdouble *)
-                                    bswap_64_array((uint64_t *) (pc + 0), 4)
-                   ));
+    glClipPlane((GLenum) bswap_ENUM(pc + 32),
+                (const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 4));
 }
 
 void
 __glXDispSwap_ColorMaterial(GLbyte * pc)
 {
-    CALL_ColorMaterial(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLenum) bswap_ENUM(pc + 4)
-                       ));
+    glColorMaterial((GLenum) bswap_ENUM(pc + 0), (GLenum) bswap_ENUM(pc + 4));
 }
 
 void
 __glXDispSwap_CullFace(GLbyte * pc)
 {
-    CALL_CullFace(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                  ));
+    glCullFace((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
 __glXDispSwap_Fogf(GLbyte * pc)
 {
-    CALL_Fogf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                               (GLfloat) bswap_FLOAT32(pc + 4)
-              ));
+    glFogf((GLenum) bswap_ENUM(pc + 0), (GLfloat) bswap_FLOAT32(pc + 4));
 }
 
 void
@@ -1044,15 +878,13 @@ __glXDispSwap_Fogfv(GLbyte * pc)
         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
                                          __glFogfv_size(pname));
 
-    CALL_Fogfv(GET_DISPATCH(), (pname, params));
+    glFogfv(pname, params);
 }
 
 void
 __glXDispSwap_Fogi(GLbyte * pc)
 {
-    CALL_Fogi(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                               (GLint) bswap_CARD32(pc + 4)
-              ));
+    glFogi((GLenum) bswap_ENUM(pc + 0), (GLint) bswap_CARD32(pc + 4));
 }
 
 void
@@ -1065,31 +897,26 @@ __glXDispSwap_Fogiv(GLbyte * pc)
         (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
                                        __glFogiv_size(pname));
 
-    CALL_Fogiv(GET_DISPATCH(), (pname, params));
+    glFogiv(pname, params);
 }
 
 void
 __glXDispSwap_FrontFace(GLbyte * pc)
 {
-    CALL_FrontFace(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                   ));
+    glFrontFace((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
 __glXDispSwap_Hint(GLbyte * pc)
 {
-    CALL_Hint(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                               (GLenum) bswap_ENUM(pc + 4)
-              ));
+    glHint((GLenum) bswap_ENUM(pc + 0), (GLenum) bswap_ENUM(pc + 4));
 }
 
 void
 __glXDispSwap_Lightf(GLbyte * pc)
 {
-    CALL_Lightf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                 (GLenum) bswap_ENUM(pc + 4),
-                                 (GLfloat) bswap_FLOAT32(pc + 8)
-                ));
+    glLightf((GLenum) bswap_ENUM(pc + 0),
+             (GLenum) bswap_ENUM(pc + 4), (GLfloat) bswap_FLOAT32(pc + 8));
 }
 
 void
@@ -1102,16 +929,14 @@ __glXDispSwap_Lightfv(GLbyte * pc)
         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
                                          __glLightfv_size(pname));
 
-    CALL_Lightfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    glLightfv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
 __glXDispSwap_Lighti(GLbyte * pc)
 {
-    CALL_Lighti(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                 (GLenum) bswap_ENUM(pc + 4),
-                                 (GLint) bswap_CARD32(pc + 8)
-                ));
+    glLighti((GLenum) bswap_ENUM(pc + 0),
+             (GLenum) bswap_ENUM(pc + 4), (GLint) bswap_CARD32(pc + 8));
 }
 
 void
@@ -1124,15 +949,13 @@ __glXDispSwap_Lightiv(GLbyte * pc)
         (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
                                        __glLightiv_size(pname));
 
-    CALL_Lightiv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    glLightiv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
 __glXDispSwap_LightModelf(GLbyte * pc)
 {
-    CALL_LightModelf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      (GLfloat) bswap_FLOAT32(pc + 4)
-                     ));
+    glLightModelf((GLenum) bswap_ENUM(pc + 0), (GLfloat) bswap_FLOAT32(pc + 4));
 }
 
 void
@@ -1145,15 +968,13 @@ __glXDispSwap_LightModelfv(GLbyte * pc)
         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
                                          __glLightModelfv_size(pname));
 
-    CALL_LightModelfv(GET_DISPATCH(), (pname, params));
+    glLightModelfv(pname, params);
 }
 
 void
 __glXDispSwap_LightModeli(GLbyte * pc)
 {
-    CALL_LightModeli(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      (GLint) bswap_CARD32(pc + 4)
-                     ));
+    glLightModeli((GLenum) bswap_ENUM(pc + 0), (GLint) bswap_CARD32(pc + 4));
 }
 
 void
@@ -1166,31 +987,27 @@ __glXDispSwap_LightModeliv(GLbyte * pc)
         (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
                                        __glLightModeliv_size(pname));
 
-    CALL_LightModeliv(GET_DISPATCH(), (pname, params));
+    glLightModeliv(pname, params);
 }
 
 void
 __glXDispSwap_LineStipple(GLbyte * pc)
 {
-    CALL_LineStipple(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                      (GLushort) bswap_CARD16(pc + 4)
-                     ));
+    glLineStipple((GLint) bswap_CARD32(pc + 0),
+                  (GLushort) bswap_CARD16(pc + 4));
 }
 
 void
 __glXDispSwap_LineWidth(GLbyte * pc)
 {
-    CALL_LineWidth(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0)
-                   ));
+    glLineWidth((GLfloat) bswap_FLOAT32(pc + 0));
 }
 
 void
 __glXDispSwap_Materialf(GLbyte * pc)
 {
-    CALL_Materialf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLenum) bswap_ENUM(pc + 4),
-                                    (GLfloat) bswap_FLOAT32(pc + 8)
-                   ));
+    glMaterialf((GLenum) bswap_ENUM(pc + 0),
+                (GLenum) bswap_ENUM(pc + 4), (GLfloat) bswap_FLOAT32(pc + 8));
 }
 
 void
@@ -1203,17 +1020,14 @@ __glXDispSwap_Materialfv(GLbyte * pc)
         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
                                          __glMaterialfv_size(pname));
 
-    CALL_Materialfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                     pname, params));
+    glMaterialfv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
 __glXDispSwap_Materiali(GLbyte * pc)
 {
-    CALL_Materiali(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLenum) bswap_ENUM(pc + 4),
-                                    (GLint) bswap_CARD32(pc + 8)
-                   ));
+    glMateriali((GLenum) bswap_ENUM(pc + 0),
+                (GLenum) bswap_ENUM(pc + 4), (GLint) bswap_CARD32(pc + 8));
 }
 
 void
@@ -1226,23 +1040,19 @@ __glXDispSwap_Materialiv(GLbyte * pc)
         (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
                                        __glMaterialiv_size(pname));
 
-    CALL_Materialiv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                     pname, params));
+    glMaterialiv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
 __glXDispSwap_PointSize(GLbyte * pc)
 {
-    CALL_PointSize(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0)
-                   ));
+    glPointSize((GLfloat) bswap_FLOAT32(pc + 0));
 }
 
 void
 __glXDispSwap_PolygonMode(GLbyte * pc)
 {
-    CALL_PolygonMode(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      (GLenum) bswap_ENUM(pc + 4)
-                     ));
+    glPolygonMode((GLenum) bswap_ENUM(pc + 0), (GLenum) bswap_ENUM(pc + 4));
 }
 
 void
@@ -1251,47 +1061,36 @@ __glXDispSwap_PolygonStipple(GLbyte * pc)
     const GLubyte *const mask = (const GLubyte *) ((pc + 20));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
 
-    CALL_PolygonStipple(GET_DISPATCH(), (mask));
+    glPolygonStipple(mask);
 }
 
 void
 __glXDispSwap_Scissor(GLbyte * pc)
 {
-    CALL_Scissor(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                  (GLint) bswap_CARD32(pc + 4),
-                                  (GLsizei) bswap_CARD32(pc + 8),
-                                  (GLsizei) bswap_CARD32(pc + 12)
-                 ));
+    glScissor((GLint) bswap_CARD32(pc + 0),
+              (GLint) bswap_CARD32(pc + 4),
+              (GLsizei) bswap_CARD32(pc + 8), (GLsizei) bswap_CARD32(pc + 12));
 }
 
 void
 __glXDispSwap_ShadeModel(GLbyte * pc)
 {
-    CALL_ShadeModel(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                    ));
+    glShadeModel((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
 __glXDispSwap_TexParameterf(GLbyte * pc)
 {
-    CALL_TexParameterf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLenum) bswap_ENUM(pc + 4),
-                                        (GLfloat) bswap_FLOAT32(pc + 8)
-                       ));
+    glTexParameterf((GLenum) bswap_ENUM(pc + 0),
+                    (GLenum) bswap_ENUM(pc + 4),
+                    (GLfloat) bswap_FLOAT32(pc + 8));
 }
 
 void
@@ -1304,17 +1103,14 @@ __glXDispSwap_TexParameterfv(GLbyte * pc)
         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
                                          __glTexParameterfv_size(pname));
 
-    CALL_TexParameterfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         pname, params));
+    glTexParameterfv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
 __glXDispSwap_TexParameteri(GLbyte * pc)
 {
-    CALL_TexParameteri(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLenum) bswap_ENUM(pc + 4),
-                                        (GLint) bswap_CARD32(pc + 8)
-                       ));
+    glTexParameteri((GLenum) bswap_ENUM(pc + 0),
+                    (GLenum) bswap_ENUM(pc + 4), (GLint) bswap_CARD32(pc + 8));
 }
 
 void
@@ -1327,8 +1123,7 @@ __glXDispSwap_TexParameteriv(GLbyte * pc)
         (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
                                        __glTexParameteriv_size(pname));
 
-    CALL_TexParameteriv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         pname, params));
+    glTexParameteriv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
@@ -1337,28 +1132,21 @@ __glXDispSwap_TexImage1D(GLbyte * pc)
     const GLvoid *const pixels = (const GLvoid *) ((pc + 52));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_TexImage1D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                     (GLint) bswap_CARD32(pc + 24),
-                                     (GLint) bswap_CARD32(pc + 28),
-                                     (GLsizei) bswap_CARD32(pc + 32),
-                                     (GLint) bswap_CARD32(pc + 40),
-                                     (GLenum) bswap_ENUM(pc + 44),
-                                     (GLenum) bswap_ENUM(pc + 48), pixels));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
+
+    glTexImage1D((GLenum) bswap_ENUM(pc + 20),
+                 (GLint) bswap_CARD32(pc + 24),
+                 (GLint) bswap_CARD32(pc + 28),
+                 (GLsizei) bswap_CARD32(pc + 32),
+                 (GLint) bswap_CARD32(pc + 40),
+                 (GLenum) bswap_ENUM(pc + 44),
+                 (GLenum) bswap_ENUM(pc + 48), pixels);
 }
 
 void
@@ -1367,38 +1155,29 @@ __glXDispSwap_TexImage2D(GLbyte * pc)
     const GLvoid *const pixels = (const GLvoid *) ((pc + 52));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_TexImage2D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                     (GLint) bswap_CARD32(pc + 24),
-                                     (GLint) bswap_CARD32(pc + 28),
-                                     (GLsizei) bswap_CARD32(pc + 32),
-                                     (GLsizei) bswap_CARD32(pc + 36),
-                                     (GLint) bswap_CARD32(pc + 40),
-                                     (GLenum) bswap_ENUM(pc + 44),
-                                     (GLenum) bswap_ENUM(pc + 48), pixels));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
+
+    glTexImage2D((GLenum) bswap_ENUM(pc + 20),
+                 (GLint) bswap_CARD32(pc + 24),
+                 (GLint) bswap_CARD32(pc + 28),
+                 (GLsizei) bswap_CARD32(pc + 32),
+                 (GLsizei) bswap_CARD32(pc + 36),
+                 (GLint) bswap_CARD32(pc + 40),
+                 (GLenum) bswap_ENUM(pc + 44),
+                 (GLenum) bswap_ENUM(pc + 48), pixels);
 }
 
 void
 __glXDispSwap_TexEnvf(GLbyte * pc)
 {
-    CALL_TexEnvf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                  (GLenum) bswap_ENUM(pc + 4),
-                                  (GLfloat) bswap_FLOAT32(pc + 8)
-                 ));
+    glTexEnvf((GLenum) bswap_ENUM(pc + 0),
+              (GLenum) bswap_ENUM(pc + 4), (GLfloat) bswap_FLOAT32(pc + 8));
 }
 
 void
@@ -1411,16 +1190,14 @@ __glXDispSwap_TexEnvfv(GLbyte * pc)
         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
                                          __glTexEnvfv_size(pname));
 
-    CALL_TexEnvfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    glTexEnvfv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
 __glXDispSwap_TexEnvi(GLbyte * pc)
 {
-    CALL_TexEnvi(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                  (GLenum) bswap_ENUM(pc + 4),
-                                  (GLint) bswap_CARD32(pc + 8)
-                 ));
+    glTexEnvi((GLenum) bswap_ENUM(pc + 0),
+              (GLenum) bswap_ENUM(pc + 4), (GLint) bswap_CARD32(pc + 8));
 }
 
 void
@@ -1433,7 +1210,7 @@ __glXDispSwap_TexEnviv(GLbyte * pc)
         (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
                                        __glTexEnviv_size(pname));
 
-    CALL_TexEnviv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    glTexEnviv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
@@ -1446,10 +1223,8 @@ __glXDispSwap_TexGend(GLbyte * pc)
     }
 #endif
 
-    CALL_TexGend(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 8),
-                                  (GLenum) bswap_ENUM(pc + 12),
-                                  (GLdouble) bswap_FLOAT64(pc + 0)
-                 ));
+    glTexGend((GLenum) bswap_ENUM(pc + 8),
+              (GLenum) bswap_ENUM(pc + 12), (GLdouble) bswap_FLOAT64(pc + 0));
 }
 
 void
@@ -1472,16 +1247,14 @@ __glXDispSwap_TexGendv(GLbyte * pc)
         (const GLdouble *) bswap_64_array((uint64_t *) (pc + 8),
                                           __glTexGendv_size(pname));
 
-    CALL_TexGendv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    glTexGendv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
 __glXDispSwap_TexGenf(GLbyte * pc)
 {
-    CALL_TexGenf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                  (GLenum) bswap_ENUM(pc + 4),
-                                  (GLfloat) bswap_FLOAT32(pc + 8)
-                 ));
+    glTexGenf((GLenum) bswap_ENUM(pc + 0),
+              (GLenum) bswap_ENUM(pc + 4), (GLfloat) bswap_FLOAT32(pc + 8));
 }
 
 void
@@ -1494,16 +1267,14 @@ __glXDispSwap_TexGenfv(GLbyte * pc)
         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
                                          __glTexGenfv_size(pname));
 
-    CALL_TexGenfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    glTexGenfv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
 __glXDispSwap_TexGeni(GLbyte * pc)
 {
-    CALL_TexGeni(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                  (GLenum) bswap_ENUM(pc + 4),
-                                  (GLint) bswap_CARD32(pc + 8)
-                 ));
+    glTexGeni((GLenum) bswap_ENUM(pc + 0),
+              (GLenum) bswap_ENUM(pc + 4), (GLint) bswap_CARD32(pc + 8));
 }
 
 void
@@ -1516,88 +1287,79 @@ __glXDispSwap_TexGeniv(GLbyte * pc)
         (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
                                        __glTexGeniv_size(pname));
 
-    CALL_TexGeniv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    glTexGeniv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
 __glXDispSwap_InitNames(GLbyte * pc)
 {
-    CALL_InitNames(GET_DISPATCH(), ());
+    glInitNames();
 }
 
 void
 __glXDispSwap_LoadName(GLbyte * pc)
 {
-    CALL_LoadName(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                  ));
+    glLoadName((GLuint) bswap_CARD32(pc + 0));
 }
 
 void
 __glXDispSwap_PassThrough(GLbyte * pc)
 {
-    CALL_PassThrough(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0)
-                     ));
+    glPassThrough((GLfloat) bswap_FLOAT32(pc + 0));
 }
 
 void
 __glXDispSwap_PopName(GLbyte * pc)
 {
-    CALL_PopName(GET_DISPATCH(), ());
+    glPopName();
 }
 
 void
 __glXDispSwap_PushName(GLbyte * pc)
 {
-    CALL_PushName(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                  ));
+    glPushName((GLuint) bswap_CARD32(pc + 0));
 }
 
 void
 __glXDispSwap_DrawBuffer(GLbyte * pc)
 {
-    CALL_DrawBuffer(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                    ));
+    glDrawBuffer((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
 __glXDispSwap_Clear(GLbyte * pc)
 {
-    CALL_Clear(GET_DISPATCH(), ((GLbitfield) bswap_CARD32(pc + 0)
-               ));
+    glClear((GLbitfield) bswap_CARD32(pc + 0));
 }
 
 void
 __glXDispSwap_ClearAccum(GLbyte * pc)
 {
-    CALL_ClearAccum(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0),
-                                     (GLfloat) bswap_FLOAT32(pc + 4),
-                                     (GLfloat) bswap_FLOAT32(pc + 8),
-                                     (GLfloat) bswap_FLOAT32(pc + 12)
-                    ));
+    glClearAccum((GLfloat) bswap_FLOAT32(pc + 0),
+                 (GLfloat) bswap_FLOAT32(pc + 4),
+                 (GLfloat) bswap_FLOAT32(pc + 8),
+                 (GLfloat) bswap_FLOAT32(pc + 12));
 }
 
 void
 __glXDispSwap_ClearIndex(GLbyte * pc)
 {
-    CALL_ClearIndex(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0)
-                    ));
+    glClearIndex((GLfloat) bswap_FLOAT32(pc + 0));
 }
 
 void
 __glXDispSwap_ClearColor(GLbyte * pc)
 {
-    CALL_ClearColor(GET_DISPATCH(), ((GLclampf) bswap_FLOAT32(pc + 0),
-                                     (GLclampf) bswap_FLOAT32(pc + 4),
-                                     (GLclampf) bswap_FLOAT32(pc + 8),
-                                     (GLclampf) bswap_FLOAT32(pc + 12)
-                    ));
+    glClearColor((GLclampf) bswap_FLOAT32(pc + 0),
+                 (GLclampf) bswap_FLOAT32(pc + 4),
+                 (GLclampf) bswap_FLOAT32(pc + 8),
+                 (GLclampf) bswap_FLOAT32(pc + 12));
 }
 
 void
 __glXDispSwap_ClearStencil(GLbyte * pc)
 {
-    CALL_ClearStencil(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0)
-                      ));
+    glClearStencil((GLint) bswap_CARD32(pc + 0));
 }
 
 void
@@ -1610,74 +1372,63 @@ __glXDispSwap_ClearDepth(GLbyte * pc)
     }
 #endif
 
-    CALL_ClearDepth(GET_DISPATCH(), ((GLclampd) bswap_FLOAT64(pc + 0)
-                    ));
+    glClearDepth((GLclampd) bswap_FLOAT64(pc + 0));
 }
 
 void
 __glXDispSwap_StencilMask(GLbyte * pc)
 {
-    CALL_StencilMask(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                     ));
+    glStencilMask((GLuint) bswap_CARD32(pc + 0));
 }
 
 void
 __glXDispSwap_ColorMask(GLbyte * pc)
 {
-    CALL_ColorMask(GET_DISPATCH(), (*(GLboolean *) (pc + 0),
-                                    *(GLboolean *) (pc + 1),
-                                    *(GLboolean *) (pc + 2),
-                                    *(GLboolean *) (pc + 3)
-                   ));
+    glColorMask(*(GLboolean *) (pc + 0),
+                *(GLboolean *) (pc + 1),
+                *(GLboolean *) (pc + 2), *(GLboolean *) (pc + 3));
 }
 
 void
 __glXDispSwap_DepthMask(GLbyte * pc)
 {
-    CALL_DepthMask(GET_DISPATCH(), (*(GLboolean *) (pc + 0)
-                   ));
+    glDepthMask(*(GLboolean *) (pc + 0));
 }
 
 void
 __glXDispSwap_IndexMask(GLbyte * pc)
 {
-    CALL_IndexMask(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                   ));
+    glIndexMask((GLuint) bswap_CARD32(pc + 0));
 }
 
 void
 __glXDispSwap_Accum(GLbyte * pc)
 {
-    CALL_Accum(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                (GLfloat) bswap_FLOAT32(pc + 4)
-               ));
+    glAccum((GLenum) bswap_ENUM(pc + 0), (GLfloat) bswap_FLOAT32(pc + 4));
 }
 
 void
 __glXDispSwap_Disable(GLbyte * pc)
 {
-    CALL_Disable(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                 ));
+    glDisable((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
 __glXDispSwap_Enable(GLbyte * pc)
 {
-    CALL_Enable(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                ));
+    glEnable((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
 __glXDispSwap_PopAttrib(GLbyte * pc)
 {
-    CALL_PopAttrib(GET_DISPATCH(), ());
+    glPopAttrib();
 }
 
 void
 __glXDispSwap_PushAttrib(GLbyte * pc)
 {
-    CALL_PushAttrib(GET_DISPATCH(), ((GLbitfield) bswap_CARD32(pc + 0)
-                    ));
+    glPushAttrib((GLbitfield) bswap_CARD32(pc + 0));
 }
 
 void
@@ -1690,19 +1441,17 @@ __glXDispSwap_MapGrid1d(GLbyte * pc)
     }
 #endif
 
-    CALL_MapGrid1d(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 16),
-                                    (GLdouble) bswap_FLOAT64(pc + 0),
-                                    (GLdouble) bswap_FLOAT64(pc + 8)
-                   ));
+    glMapGrid1d((GLint) bswap_CARD32(pc + 16),
+                (GLdouble) bswap_FLOAT64(pc + 0),
+                (GLdouble) bswap_FLOAT64(pc + 8));
 }
 
 void
 __glXDispSwap_MapGrid1f(GLbyte * pc)
 {
-    CALL_MapGrid1f(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                    (GLfloat) bswap_FLOAT32(pc + 4),
-                                    (GLfloat) bswap_FLOAT32(pc + 8)
-                   ));
+    glMapGrid1f((GLint) bswap_CARD32(pc + 0),
+                (GLfloat) bswap_FLOAT32(pc + 4),
+                (GLfloat) bswap_FLOAT32(pc + 8));
 }
 
 void
@@ -1715,25 +1464,23 @@ __glXDispSwap_MapGrid2d(GLbyte * pc)
     }
 #endif
 
-    CALL_MapGrid2d(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 32),
-                                    (GLdouble) bswap_FLOAT64(pc + 0),
-                                    (GLdouble) bswap_FLOAT64(pc + 8),
-                                    (GLint) bswap_CARD32(pc + 36),
-                                    (GLdouble) bswap_FLOAT64(pc + 16),
-                                    (GLdouble) bswap_FLOAT64(pc + 24)
-                   ));
+    glMapGrid2d((GLint) bswap_CARD32(pc + 32),
+                (GLdouble) bswap_FLOAT64(pc + 0),
+                (GLdouble) bswap_FLOAT64(pc + 8),
+                (GLint) bswap_CARD32(pc + 36),
+                (GLdouble) bswap_FLOAT64(pc + 16),
+                (GLdouble) bswap_FLOAT64(pc + 24));
 }
 
 void
 __glXDispSwap_MapGrid2f(GLbyte * pc)
 {
-    CALL_MapGrid2f(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                    (GLfloat) bswap_FLOAT32(pc + 4),
-                                    (GLfloat) bswap_FLOAT32(pc + 8),
-                                    (GLint) bswap_CARD32(pc + 12),
-                                    (GLfloat) bswap_FLOAT32(pc + 16),
-                                    (GLfloat) bswap_FLOAT32(pc + 20)
-                   ));
+    glMapGrid2f((GLint) bswap_CARD32(pc + 0),
+                (GLfloat) bswap_FLOAT32(pc + 4),
+                (GLfloat) bswap_FLOAT32(pc + 8),
+                (GLint) bswap_CARD32(pc + 12),
+                (GLfloat) bswap_FLOAT32(pc + 16),
+                (GLfloat) bswap_FLOAT32(pc + 20));
 }
 
 void
@@ -1746,17 +1493,13 @@ __glXDispSwap_EvalCoord1dv(GLbyte * pc)
     }
 #endif
 
-    CALL_EvalCoord1dv(GET_DISPATCH(), ((const GLdouble *)
-                                       bswap_64_array((uint64_t *) (pc + 0), 1)
-                      ));
+    glEvalCoord1dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 1));
 }
 
 void
 __glXDispSwap_EvalCoord1fv(GLbyte * pc)
 {
-    CALL_EvalCoord1fv(GET_DISPATCH(), ((const GLfloat *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 1)
-                      ));
+    glEvalCoord1fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 1));
 }
 
 void
@@ -1769,124 +1512,99 @@ __glXDispSwap_EvalCoord2dv(GLbyte * pc)
     }
 #endif
 
-    CALL_EvalCoord2dv(GET_DISPATCH(), ((const GLdouble *)
-                                       bswap_64_array((uint64_t *) (pc + 0), 2)
-                      ));
+    glEvalCoord2dv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 2));
 }
 
 void
 __glXDispSwap_EvalCoord2fv(GLbyte * pc)
 {
-    CALL_EvalCoord2fv(GET_DISPATCH(), ((const GLfloat *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 2)
-                      ));
+    glEvalCoord2fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 2));
 }
 
 void
 __glXDispSwap_EvalMesh1(GLbyte * pc)
 {
-    CALL_EvalMesh1(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLint) bswap_CARD32(pc + 4),
-                                    (GLint) bswap_CARD32(pc + 8)
-                   ));
+    glEvalMesh1((GLenum) bswap_ENUM(pc + 0),
+                (GLint) bswap_CARD32(pc + 4), (GLint) bswap_CARD32(pc + 8));
 }
 
 void
 __glXDispSwap_EvalPoint1(GLbyte * pc)
 {
-    CALL_EvalPoint1(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0)
-                    ));
+    glEvalPoint1((GLint) bswap_CARD32(pc + 0));
 }
 
 void
 __glXDispSwap_EvalMesh2(GLbyte * pc)
 {
-    CALL_EvalMesh2(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLint) bswap_CARD32(pc + 4),
-                                    (GLint) bswap_CARD32(pc + 8),
-                                    (GLint) bswap_CARD32(pc + 12),
-                                    (GLint) bswap_CARD32(pc + 16)
-                   ));
+    glEvalMesh2((GLenum) bswap_ENUM(pc + 0),
+                (GLint) bswap_CARD32(pc + 4),
+                (GLint) bswap_CARD32(pc + 8),
+                (GLint) bswap_CARD32(pc + 12), (GLint) bswap_CARD32(pc + 16));
 }
 
 void
 __glXDispSwap_EvalPoint2(GLbyte * pc)
 {
-    CALL_EvalPoint2(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                     (GLint) bswap_CARD32(pc + 4)
-                    ));
+    glEvalPoint2((GLint) bswap_CARD32(pc + 0), (GLint) bswap_CARD32(pc + 4));
 }
 
 void
 __glXDispSwap_AlphaFunc(GLbyte * pc)
 {
-    CALL_AlphaFunc(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLclampf) bswap_FLOAT32(pc + 4)
-                   ));
+    glAlphaFunc((GLenum) bswap_ENUM(pc + 0), (GLclampf) bswap_FLOAT32(pc + 4));
 }
 
 void
 __glXDispSwap_BlendFunc(GLbyte * pc)
 {
-    CALL_BlendFunc(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLenum) bswap_ENUM(pc + 4)
-                   ));
+    glBlendFunc((GLenum) bswap_ENUM(pc + 0), (GLenum) bswap_ENUM(pc + 4));
 }
 
 void
 __glXDispSwap_LogicOp(GLbyte * pc)
 {
-    CALL_LogicOp(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                 ));
+    glLogicOp((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
 __glXDispSwap_StencilFunc(GLbyte * pc)
 {
-    CALL_StencilFunc(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      (GLint) bswap_CARD32(pc + 4),
-                                      (GLuint) bswap_CARD32(pc + 8)
-                     ));
+    glStencilFunc((GLenum) bswap_ENUM(pc + 0),
+                  (GLint) bswap_CARD32(pc + 4), (GLuint) bswap_CARD32(pc + 8));
 }
 
 void
 __glXDispSwap_StencilOp(GLbyte * pc)
 {
-    CALL_StencilOp(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLenum) bswap_ENUM(pc + 4),
-                                    (GLenum) bswap_ENUM(pc + 8)
-                   ));
+    glStencilOp((GLenum) bswap_ENUM(pc + 0),
+                (GLenum) bswap_ENUM(pc + 4), (GLenum) bswap_ENUM(pc + 8));
 }
 
 void
 __glXDispSwap_DepthFunc(GLbyte * pc)
 {
-    CALL_DepthFunc(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                   ));
+    glDepthFunc((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
 __glXDispSwap_PixelZoom(GLbyte * pc)
 {
-    CALL_PixelZoom(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0),
-                                    (GLfloat) bswap_FLOAT32(pc + 4)
-                   ));
+    glPixelZoom((GLfloat) bswap_FLOAT32(pc + 0),
+                (GLfloat) bswap_FLOAT32(pc + 4));
 }
 
 void
 __glXDispSwap_PixelTransferf(GLbyte * pc)
 {
-    CALL_PixelTransferf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         (GLfloat) bswap_FLOAT32(pc + 4)
-                        ));
+    glPixelTransferf((GLenum) bswap_ENUM(pc + 0),
+                     (GLfloat) bswap_FLOAT32(pc + 4));
 }
 
 void
 __glXDispSwap_PixelTransferi(GLbyte * pc)
 {
-    CALL_PixelTransferi(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         (GLint) bswap_CARD32(pc + 4)
-                        ));
+    glPixelTransferi((GLenum) bswap_ENUM(pc + 0), (GLint) bswap_CARD32(pc + 4));
 }
 
 int
@@ -1899,9 +1617,8 @@ __glXDispSwap_PixelStoref(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        CALL_PixelStoref(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          (GLfloat) bswap_FLOAT32(pc + 4)
-                         ));
+        glPixelStoref((GLenum) bswap_ENUM(pc + 0),
+                      (GLfloat) bswap_FLOAT32(pc + 4));
         error = Success;
     }
 
@@ -1918,9 +1635,8 @@ __glXDispSwap_PixelStorei(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        CALL_PixelStorei(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          (GLint) bswap_CARD32(pc + 4)
-                         ));
+        glPixelStorei((GLenum) bswap_ENUM(pc + 0),
+                      (GLint) bswap_CARD32(pc + 4));
         error = Success;
     }
 
@@ -1932,11 +1648,9 @@ __glXDispSwap_PixelMapfv(GLbyte * pc)
 {
     const GLsizei mapsize = (GLsizei) bswap_CARD32(pc + 4);
 
-    CALL_PixelMapfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                     mapsize,
-                                     (const GLfloat *)
-                                     bswap_32_array((uint32_t *) (pc + 8), 0)
-                    ));
+    glPixelMapfv((GLenum) bswap_ENUM(pc + 0),
+                 mapsize,
+                 (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8), 0));
 }
 
 void
@@ -1944,11 +1658,9 @@ __glXDispSwap_PixelMapuiv(GLbyte * pc)
 {
     const GLsizei mapsize = (GLsizei) bswap_CARD32(pc + 4);
 
-    CALL_PixelMapuiv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      mapsize,
-                                      (const GLuint *)
-                                      bswap_32_array((uint32_t *) (pc + 8), 0)
-                     ));
+    glPixelMapuiv((GLenum) bswap_ENUM(pc + 0),
+                  mapsize,
+                  (const GLuint *) bswap_32_array((uint32_t *) (pc + 8), 0));
 }
 
 void
@@ -1956,29 +1668,24 @@ __glXDispSwap_PixelMapusv(GLbyte * pc)
 {
     const GLsizei mapsize = (GLsizei) bswap_CARD32(pc + 4);
 
-    CALL_PixelMapusv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      mapsize,
-                                      (const GLushort *)
-                                      bswap_16_array((uint16_t *) (pc + 8), 0)
-                     ));
+    glPixelMapusv((GLenum) bswap_ENUM(pc + 0),
+                  mapsize,
+                  (const GLushort *) bswap_16_array((uint16_t *) (pc + 8), 0));
 }
 
 void
 __glXDispSwap_ReadBuffer(GLbyte * pc)
 {
-    CALL_ReadBuffer(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                    ));
+    glReadBuffer((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
 __glXDispSwap_CopyPixels(GLbyte * pc)
 {
-    CALL_CopyPixels(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                     (GLint) bswap_CARD32(pc + 4),
-                                     (GLsizei) bswap_CARD32(pc + 8),
-                                     (GLsizei) bswap_CARD32(pc + 12),
-                                     (GLenum) bswap_ENUM(pc + 16)
-                    ));
+    glCopyPixels((GLint) bswap_CARD32(pc + 0),
+                 (GLint) bswap_CARD32(pc + 4),
+                 (GLsizei) bswap_CARD32(pc + 8),
+                 (GLsizei) bswap_CARD32(pc + 12), (GLenum) bswap_ENUM(pc + 16));
 }
 
 void
@@ -1987,25 +1694,18 @@ __glXDispSwap_DrawPixels(GLbyte * pc)
     const GLvoid *const pixels = (const GLvoid *) ((pc + 36));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_DrawPixels(GET_DISPATCH(), ((GLsizei) bswap_CARD32(pc + 20),
-                                     (GLsizei) bswap_CARD32(pc + 24),
-                                     (GLenum) bswap_ENUM(pc + 28),
-                                     (GLenum) bswap_ENUM(pc + 32), pixels));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
+
+    glDrawPixels((GLsizei) bswap_CARD32(pc + 20),
+                 (GLsizei) bswap_CARD32(pc + 24),
+                 (GLenum) bswap_ENUM(pc + 28),
+                 (GLenum) bswap_ENUM(pc + 32), pixels);
 }
 
 int
@@ -2030,7 +1730,7 @@ __glXDispSwap_GetBooleanv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetBooleanv(GET_DISPATCH(), (pname, params));
+        glGetBooleanv(pname, params);
         __glXSendReplySwap(cl->client, params, compsize, 1, GL_FALSE, 0);
         error = Success;
     }
@@ -2050,8 +1750,7 @@ __glXDispSwap_GetClipPlane(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLdouble equation[4];
 
-        CALL_GetClipPlane(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                           equation));
+        glGetClipPlane((GLenum) bswap_ENUM(pc + 0), equation);
         (void) bswap_64_array((uint64_t *) equation, 4);
         __glXSendReplySwap(cl->client, equation, 4, 8, GL_TRUE, 0);
         error = Success;
@@ -2082,7 +1781,7 @@ __glXDispSwap_GetDoublev(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetDoublev(GET_DISPATCH(), (pname, params));
+        glGetDoublev(pname, params);
         (void) bswap_64_array((uint64_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
         error = Success;
@@ -2103,7 +1802,7 @@ __glXDispSwap_GetError(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLenum retval;
 
-        retval = CALL_GetError(GET_DISPATCH(), ());
+        retval = glGetError();
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2133,7 +1832,7 @@ __glXDispSwap_GetFloatv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetFloatv(GET_DISPATCH(), (pname, params));
+        glGetFloatv(pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2164,7 +1863,7 @@ __glXDispSwap_GetIntegerv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetIntegerv(GET_DISPATCH(), (pname, params));
+        glGetIntegerv(pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2195,8 +1894,7 @@ __glXDispSwap_GetLightfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetLightfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         pname, params));
+        glGetLightfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2227,8 +1925,7 @@ __glXDispSwap_GetLightiv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetLightiv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         pname, params));
+        glGetLightiv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2260,7 +1957,7 @@ __glXDispSwap_GetMapdv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMapdv(GET_DISPATCH(), (target, query, v));
+        glGetMapdv(target, query, v);
         (void) bswap_64_array((uint64_t *) v, compsize);
         __glXSendReplySwap(cl->client, v, compsize, 8, GL_FALSE, 0);
         error = Success;
@@ -2292,7 +1989,7 @@ __glXDispSwap_GetMapfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMapfv(GET_DISPATCH(), (target, query, v));
+        glGetMapfv(target, query, v);
         (void) bswap_32_array((uint32_t *) v, compsize);
         __glXSendReplySwap(cl->client, v, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2324,7 +2021,7 @@ __glXDispSwap_GetMapiv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMapiv(GET_DISPATCH(), (target, query, v));
+        glGetMapiv(target, query, v);
         (void) bswap_32_array((uint32_t *) v, compsize);
         __glXSendReplySwap(cl->client, v, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2355,8 +2052,7 @@ __glXDispSwap_GetMaterialfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMaterialfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            pname, params));
+        glGetMaterialfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2387,8 +2083,7 @@ __glXDispSwap_GetMaterialiv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMaterialiv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            pname, params));
+        glGetMaterialiv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2419,7 +2114,7 @@ __glXDispSwap_GetPixelMapfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetPixelMapfv(GET_DISPATCH(), (map, values));
+        glGetPixelMapfv(map, values);
         (void) bswap_32_array((uint32_t *) values, compsize);
         __glXSendReplySwap(cl->client, values, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2450,7 +2145,7 @@ __glXDispSwap_GetPixelMapuiv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetPixelMapuiv(GET_DISPATCH(), (map, values));
+        glGetPixelMapuiv(map, values);
         (void) bswap_32_array((uint32_t *) values, compsize);
         __glXSendReplySwap(cl->client, values, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2481,7 +2176,7 @@ __glXDispSwap_GetPixelMapusv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetPixelMapusv(GET_DISPATCH(), (map, values));
+        glGetPixelMapusv(map, values);
         (void) bswap_16_array((uint16_t *) values, compsize);
         __glXSendReplySwap(cl->client, values, compsize, 2, GL_FALSE, 0);
         error = Success;
@@ -2512,8 +2207,7 @@ __glXDispSwap_GetTexEnvfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexEnvfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          pname, params));
+        glGetTexEnvfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2544,8 +2238,7 @@ __glXDispSwap_GetTexEnviv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexEnviv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          pname, params));
+        glGetTexEnviv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2576,8 +2269,7 @@ __glXDispSwap_GetTexGendv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexGendv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          pname, params));
+        glGetTexGendv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_64_array((uint64_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
         error = Success;
@@ -2608,8 +2300,7 @@ __glXDispSwap_GetTexGenfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexGenfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          pname, params));
+        glGetTexGenfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2640,8 +2331,7 @@ __glXDispSwap_GetTexGeniv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexGeniv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          pname, params));
+        glGetTexGeniv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2672,8 +2362,7 @@ __glXDispSwap_GetTexParameterfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexParameterfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                pname, params));
+        glGetTexParameterfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2704,8 +2393,7 @@ __glXDispSwap_GetTexParameteriv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexParameteriv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                pname, params));
+        glGetTexParameteriv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2736,11 +2424,8 @@ __glXDispSwap_GetTexLevelParameterfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexLevelParameterfv(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          4),
-                                                     pname, params));
+        glGetTexLevelParameterfv((GLenum) bswap_ENUM(pc + 0),
+                                 (GLint) bswap_CARD32(pc + 4), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2771,11 +2456,8 @@ __glXDispSwap_GetTexLevelParameteriv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexLevelParameteriv(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          4),
-                                                     pname, params));
+        glGetTexLevelParameteriv((GLenum) bswap_ENUM(pc + 0),
+                                 (GLint) bswap_CARD32(pc + 4), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -2796,8 +2478,7 @@ __glXDispSwap_IsEnabled(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLboolean retval;
 
-        retval = CALL_IsEnabled(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                                ));
+        retval = glIsEnabled((GLenum) bswap_ENUM(pc + 0));
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2817,8 +2498,7 @@ __glXDispSwap_IsList(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLboolean retval;
 
-        retval = CALL_IsList(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                             ));
+        retval = glIsList((GLuint) bswap_CARD32(pc + 0));
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2836,9 +2516,8 @@ __glXDispSwap_DepthRange(GLbyte * pc)
     }
 #endif
 
-    CALL_DepthRange(GET_DISPATCH(), ((GLclampd) bswap_FLOAT64(pc + 0),
-                                     (GLclampd) bswap_FLOAT64(pc + 8)
-                    ));
+    glDepthRange((GLclampd) bswap_FLOAT64(pc + 0),
+                 (GLclampd) bswap_FLOAT64(pc + 8));
 }
 
 void
@@ -2851,27 +2530,24 @@ __glXDispSwap_Frustum(GLbyte * pc)
     }
 #endif
 
-    CALL_Frustum(GET_DISPATCH(), ((GLdouble) bswap_FLOAT64(pc + 0),
-                                  (GLdouble) bswap_FLOAT64(pc + 8),
-                                  (GLdouble) bswap_FLOAT64(pc + 16),
-                                  (GLdouble) bswap_FLOAT64(pc + 24),
-                                  (GLdouble) bswap_FLOAT64(pc + 32),
-                                  (GLdouble) bswap_FLOAT64(pc + 40)
-                 ));
+    glFrustum((GLdouble) bswap_FLOAT64(pc + 0),
+              (GLdouble) bswap_FLOAT64(pc + 8),
+              (GLdouble) bswap_FLOAT64(pc + 16),
+              (GLdouble) bswap_FLOAT64(pc + 24),
+              (GLdouble) bswap_FLOAT64(pc + 32),
+              (GLdouble) bswap_FLOAT64(pc + 40));
 }
 
 void
 __glXDispSwap_LoadIdentity(GLbyte * pc)
 {
-    CALL_LoadIdentity(GET_DISPATCH(), ());
+    glLoadIdentity();
 }
 
 void
 __glXDispSwap_LoadMatrixf(GLbyte * pc)
 {
-    CALL_LoadMatrixf(GET_DISPATCH(), ((const GLfloat *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 16)
-                     ));
+    glLoadMatrixf((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 16));
 }
 
 void
@@ -2884,24 +2560,19 @@ __glXDispSwap_LoadMatrixd(GLbyte * pc)
     }
 #endif
 
-    CALL_LoadMatrixd(GET_DISPATCH(), ((const GLdouble *)
-                                      bswap_64_array((uint64_t *) (pc + 0), 16)
-                     ));
+    glLoadMatrixd((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 16));
 }
 
 void
 __glXDispSwap_MatrixMode(GLbyte * pc)
 {
-    CALL_MatrixMode(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                    ));
+    glMatrixMode((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
 __glXDispSwap_MultMatrixf(GLbyte * pc)
 {
-    CALL_MultMatrixf(GET_DISPATCH(), ((const GLfloat *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 16)
-                     ));
+    glMultMatrixf((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 16));
 }
 
 void
@@ -2914,9 +2585,7 @@ __glXDispSwap_MultMatrixd(GLbyte * pc)
     }
 #endif
 
-    CALL_MultMatrixd(GET_DISPATCH(), ((const GLdouble *)
-                                      bswap_64_array((uint64_t *) (pc + 0), 16)
-                     ));
+    glMultMatrixd((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 16));
 }
 
 void
@@ -2929,25 +2598,24 @@ __glXDispSwap_Ortho(GLbyte * pc)
     }
 #endif
 
-    CALL_Ortho(GET_DISPATCH(), ((GLdouble) bswap_FLOAT64(pc + 0),
-                                (GLdouble) bswap_FLOAT64(pc + 8),
-                                (GLdouble) bswap_FLOAT64(pc + 16),
-                                (GLdouble) bswap_FLOAT64(pc + 24),
-                                (GLdouble) bswap_FLOAT64(pc + 32),
-                                (GLdouble) bswap_FLOAT64(pc + 40)
-               ));
+    glOrtho((GLdouble) bswap_FLOAT64(pc + 0),
+            (GLdouble) bswap_FLOAT64(pc + 8),
+            (GLdouble) bswap_FLOAT64(pc + 16),
+            (GLdouble) bswap_FLOAT64(pc + 24),
+            (GLdouble) bswap_FLOAT64(pc + 32),
+            (GLdouble) bswap_FLOAT64(pc + 40));
 }
 
 void
 __glXDispSwap_PopMatrix(GLbyte * pc)
 {
-    CALL_PopMatrix(GET_DISPATCH(), ());
+    glPopMatrix();
 }
 
 void
 __glXDispSwap_PushMatrix(GLbyte * pc)
 {
-    CALL_PushMatrix(GET_DISPATCH(), ());
+    glPushMatrix();
 }
 
 void
@@ -2960,21 +2628,19 @@ __glXDispSwap_Rotated(GLbyte * pc)
     }
 #endif
 
-    CALL_Rotated(GET_DISPATCH(), ((GLdouble) bswap_FLOAT64(pc + 0),
-                                  (GLdouble) bswap_FLOAT64(pc + 8),
-                                  (GLdouble) bswap_FLOAT64(pc + 16),
-                                  (GLdouble) bswap_FLOAT64(pc + 24)
-                 ));
+    glRotated((GLdouble) bswap_FLOAT64(pc + 0),
+              (GLdouble) bswap_FLOAT64(pc + 8),
+              (GLdouble) bswap_FLOAT64(pc + 16),
+              (GLdouble) bswap_FLOAT64(pc + 24));
 }
 
 void
 __glXDispSwap_Rotatef(GLbyte * pc)
 {
-    CALL_Rotatef(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0),
-                                  (GLfloat) bswap_FLOAT32(pc + 4),
-                                  (GLfloat) bswap_FLOAT32(pc + 8),
-                                  (GLfloat) bswap_FLOAT32(pc + 12)
-                 ));
+    glRotatef((GLfloat) bswap_FLOAT32(pc + 0),
+              (GLfloat) bswap_FLOAT32(pc + 4),
+              (GLfloat) bswap_FLOAT32(pc + 8),
+              (GLfloat) bswap_FLOAT32(pc + 12));
 }
 
 void
@@ -2987,19 +2653,16 @@ __glXDispSwap_Scaled(GLbyte * pc)
     }
 #endif
 
-    CALL_Scaled(GET_DISPATCH(), ((GLdouble) bswap_FLOAT64(pc + 0),
-                                 (GLdouble) bswap_FLOAT64(pc + 8),
-                                 (GLdouble) bswap_FLOAT64(pc + 16)
-                ));
+    glScaled((GLdouble) bswap_FLOAT64(pc + 0),
+             (GLdouble) bswap_FLOAT64(pc + 8),
+             (GLdouble) bswap_FLOAT64(pc + 16));
 }
 
 void
 __glXDispSwap_Scalef(GLbyte * pc)
 {
-    CALL_Scalef(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0),
-                                 (GLfloat) bswap_FLOAT32(pc + 4),
-                                 (GLfloat) bswap_FLOAT32(pc + 8)
-                ));
+    glScalef((GLfloat) bswap_FLOAT32(pc + 0),
+             (GLfloat) bswap_FLOAT32(pc + 4), (GLfloat) bswap_FLOAT32(pc + 8));
 }
 
 void
@@ -3012,52 +2675,44 @@ __glXDispSwap_Translated(GLbyte * pc)
     }
 #endif
 
-    CALL_Translated(GET_DISPATCH(), ((GLdouble) bswap_FLOAT64(pc + 0),
-                                     (GLdouble) bswap_FLOAT64(pc + 8),
-                                     (GLdouble) bswap_FLOAT64(pc + 16)
-                    ));
+    glTranslated((GLdouble) bswap_FLOAT64(pc + 0),
+                 (GLdouble) bswap_FLOAT64(pc + 8),
+                 (GLdouble) bswap_FLOAT64(pc + 16));
 }
 
 void
 __glXDispSwap_Translatef(GLbyte * pc)
 {
-    CALL_Translatef(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0),
-                                     (GLfloat) bswap_FLOAT32(pc + 4),
-                                     (GLfloat) bswap_FLOAT32(pc + 8)
-                    ));
+    glTranslatef((GLfloat) bswap_FLOAT32(pc + 0),
+                 (GLfloat) bswap_FLOAT32(pc + 4),
+                 (GLfloat) bswap_FLOAT32(pc + 8));
 }
 
 void
 __glXDispSwap_Viewport(GLbyte * pc)
 {
-    CALL_Viewport(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                   (GLint) bswap_CARD32(pc + 4),
-                                   (GLsizei) bswap_CARD32(pc + 8),
-                                   (GLsizei) bswap_CARD32(pc + 12)
-                  ));
+    glViewport((GLint) bswap_CARD32(pc + 0),
+               (GLint) bswap_CARD32(pc + 4),
+               (GLsizei) bswap_CARD32(pc + 8), (GLsizei) bswap_CARD32(pc + 12));
 }
 
 void
 __glXDispSwap_BindTexture(GLbyte * pc)
 {
-    CALL_BindTexture(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      (GLuint) bswap_CARD32(pc + 4)
-                     ));
+    glBindTexture((GLenum) bswap_ENUM(pc + 0), (GLuint) bswap_CARD32(pc + 4));
 }
 
 void
 __glXDispSwap_Indexubv(GLbyte * pc)
 {
-    CALL_Indexubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                  ));
+    glIndexubv((const GLubyte *) (pc + 0));
 }
 
 void
 __glXDispSwap_PolygonOffset(GLbyte * pc)
 {
-    CALL_PolygonOffset(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0),
-                                        (GLfloat) bswap_FLOAT32(pc + 4)
-                       ));
+    glPolygonOffset((GLfloat) bswap_FLOAT32(pc + 0),
+                    (GLfloat) bswap_FLOAT32(pc + 4));
 }
 
 int
@@ -3077,11 +2732,10 @@ __glXDispSwap_AreTexturesResident(__GLXclientState * cl, GLbyte * pc)
         GLboolean *residences =
             __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
         retval =
-            CALL_AreTexturesResident(GET_DISPATCH(),
-                                     (n,
-                                      (const GLuint *)
-                                      bswap_32_array((uint32_t *) (pc + 4), 0),
-                                      residences));
+            glAreTexturesResident(n,
+                                  (const GLuint *)
+                                  bswap_32_array((uint32_t *) (pc + 4), 0),
+                                  residences);
         __glXSendReplySwap(cl->client, residences, n, 1, GL_TRUE, retval);
         error = Success;
     }
@@ -3106,11 +2760,10 @@ __glXDispSwap_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc)
         GLboolean *residences =
             __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
         retval =
-            CALL_AreTexturesResident(GET_DISPATCH(),
-                                     (n,
-                                      (const GLuint *)
-                                      bswap_32_array((uint32_t *) (pc + 4), 0),
-                                      residences));
+            glAreTexturesResident(n,
+                                  (const GLuint *)
+                                  bswap_32_array((uint32_t *) (pc + 4), 0),
+                                  residences);
         __glXSendReplySwap(cl->client, residences, n, 1, GL_TRUE, retval);
         error = Success;
     }
@@ -3121,54 +2774,50 @@ __glXDispSwap_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc)
 void
 __glXDispSwap_CopyTexImage1D(GLbyte * pc)
 {
-    CALL_CopyTexImage1D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         (GLint) bswap_CARD32(pc + 4),
-                                         (GLenum) bswap_ENUM(pc + 8),
-                                         (GLint) bswap_CARD32(pc + 12),
-                                         (GLint) bswap_CARD32(pc + 16),
-                                         (GLsizei) bswap_CARD32(pc + 20),
-                                         (GLint) bswap_CARD32(pc + 24)
-                        ));
+    glCopyTexImage1D((GLenum) bswap_ENUM(pc + 0),
+                     (GLint) bswap_CARD32(pc + 4),
+                     (GLenum) bswap_ENUM(pc + 8),
+                     (GLint) bswap_CARD32(pc + 12),
+                     (GLint) bswap_CARD32(pc + 16),
+                     (GLsizei) bswap_CARD32(pc + 20),
+                     (GLint) bswap_CARD32(pc + 24));
 }
 
 void
 __glXDispSwap_CopyTexImage2D(GLbyte * pc)
 {
-    CALL_CopyTexImage2D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         (GLint) bswap_CARD32(pc + 4),
-                                         (GLenum) bswap_ENUM(pc + 8),
-                                         (GLint) bswap_CARD32(pc + 12),
-                                         (GLint) bswap_CARD32(pc + 16),
-                                         (GLsizei) bswap_CARD32(pc + 20),
-                                         (GLsizei) bswap_CARD32(pc + 24),
-                                         (GLint) bswap_CARD32(pc + 28)
-                        ));
+    glCopyTexImage2D((GLenum) bswap_ENUM(pc + 0),
+                     (GLint) bswap_CARD32(pc + 4),
+                     (GLenum) bswap_ENUM(pc + 8),
+                     (GLint) bswap_CARD32(pc + 12),
+                     (GLint) bswap_CARD32(pc + 16),
+                     (GLsizei) bswap_CARD32(pc + 20),
+                     (GLsizei) bswap_CARD32(pc + 24),
+                     (GLint) bswap_CARD32(pc + 28));
 }
 
 void
 __glXDispSwap_CopyTexSubImage1D(GLbyte * pc)
 {
-    CALL_CopyTexSubImage1D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            (GLint) bswap_CARD32(pc + 4),
-                                            (GLint) bswap_CARD32(pc + 8),
-                                            (GLint) bswap_CARD32(pc + 12),
-                                            (GLint) bswap_CARD32(pc + 16),
-                                            (GLsizei) bswap_CARD32(pc + 20)
-                           ));
+    glCopyTexSubImage1D((GLenum) bswap_ENUM(pc + 0),
+                        (GLint) bswap_CARD32(pc + 4),
+                        (GLint) bswap_CARD32(pc + 8),
+                        (GLint) bswap_CARD32(pc + 12),
+                        (GLint) bswap_CARD32(pc + 16),
+                        (GLsizei) bswap_CARD32(pc + 20));
 }
 
 void
 __glXDispSwap_CopyTexSubImage2D(GLbyte * pc)
 {
-    CALL_CopyTexSubImage2D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            (GLint) bswap_CARD32(pc + 4),
-                                            (GLint) bswap_CARD32(pc + 8),
-                                            (GLint) bswap_CARD32(pc + 12),
-                                            (GLint) bswap_CARD32(pc + 16),
-                                            (GLint) bswap_CARD32(pc + 20),
-                                            (GLsizei) bswap_CARD32(pc + 24),
-                                            (GLsizei) bswap_CARD32(pc + 28)
-                           ));
+    glCopyTexSubImage2D((GLenum) bswap_ENUM(pc + 0),
+                        (GLint) bswap_CARD32(pc + 4),
+                        (GLint) bswap_CARD32(pc + 8),
+                        (GLint) bswap_CARD32(pc + 12),
+                        (GLint) bswap_CARD32(pc + 16),
+                        (GLint) bswap_CARD32(pc + 20),
+                        (GLsizei) bswap_CARD32(pc + 24),
+                        (GLsizei) bswap_CARD32(pc + 28));
 }
 
 int
@@ -3183,11 +2832,9 @@ __glXDispSwap_DeleteTextures(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
 
-        CALL_DeleteTextures(GET_DISPATCH(), (n,
-                                             (const GLuint *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 0)
-                            ));
+        glDeleteTextures(n,
+                         (const GLuint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                         0));
         error = Success;
     }
 
@@ -3206,11 +2853,9 @@ __glXDispSwap_DeleteTexturesEXT(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
 
-        CALL_DeleteTextures(GET_DISPATCH(), (n,
-                                             (const GLuint *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 0)
-                            ));
+        glDeleteTextures(n,
+                         (const GLuint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                         0));
         error = Success;
     }
 
@@ -3233,7 +2878,7 @@ __glXDispSwap_GenTextures(__GLXclientState * cl, GLbyte * pc)
         GLuint *textures =
             __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                  4);
-        CALL_GenTextures(GET_DISPATCH(), (n, textures));
+        glGenTextures(n, textures);
         (void) bswap_32_array((uint32_t *) textures, n);
         __glXSendReplySwap(cl->client, textures, n, 4, GL_TRUE, 0);
         error = Success;
@@ -3258,7 +2903,7 @@ __glXDispSwap_GenTexturesEXT(__GLXclientState * cl, GLbyte * pc)
         GLuint *textures =
             __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                  4);
-        CALL_GenTextures(GET_DISPATCH(), (n, textures));
+        glGenTextures(n, textures);
         (void) bswap_32_array((uint32_t *) textures, n);
         __glXSendReplySwap(cl->client, textures, n, 4, GL_TRUE, 0);
         error = Success;
@@ -3279,8 +2924,7 @@ __glXDispSwap_IsTexture(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLboolean retval;
 
-        retval = CALL_IsTexture(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                                ));
+        retval = glIsTexture((GLuint) bswap_CARD32(pc + 0));
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -3300,8 +2944,7 @@ __glXDispSwap_IsTextureEXT(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLboolean retval;
 
-        retval = CALL_IsTexture(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                                ));
+        retval = glIsTexture((GLuint) bswap_CARD32(pc + 0));
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -3314,15 +2957,11 @@ __glXDispSwap_PrioritizeTextures(GLbyte * pc)
 {
     const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
 
-    CALL_PrioritizeTextures(GET_DISPATCH(), (n,
-                                             (const GLuint *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4),
-                                                            0),
-                                             (const GLclampf *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 0)
-                            ));
+    glPrioritizeTextures(n,
+                         (const GLuint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                         0),
+                         (const GLclampf *)
+                         bswap_32_array((uint32_t *) (pc + 4), 0));
 }
 
 void
@@ -3331,27 +2970,20 @@ __glXDispSwap_TexSubImage1D(GLbyte * pc)
     const GLvoid *const pixels = (const GLvoid *) ((pc + 56));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_TexSubImage1D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                        (GLint) bswap_CARD32(pc + 24),
-                                        (GLint) bswap_CARD32(pc + 28),
-                                        (GLsizei) bswap_CARD32(pc + 36),
-                                        (GLenum) bswap_ENUM(pc + 44),
-                                        (GLenum) bswap_ENUM(pc + 48), pixels));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
+
+    glTexSubImage1D((GLenum) bswap_ENUM(pc + 20),
+                    (GLint) bswap_CARD32(pc + 24),
+                    (GLint) bswap_CARD32(pc + 28),
+                    (GLsizei) bswap_CARD32(pc + 36),
+                    (GLenum) bswap_ENUM(pc + 44),
+                    (GLenum) bswap_ENUM(pc + 48), pixels);
 }
 
 void
@@ -3360,46 +2992,37 @@ __glXDispSwap_TexSubImage2D(GLbyte * pc)
     const GLvoid *const pixels = (const GLvoid *) ((pc + 56));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_TexSubImage2D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                        (GLint) bswap_CARD32(pc + 24),
-                                        (GLint) bswap_CARD32(pc + 28),
-                                        (GLint) bswap_CARD32(pc + 32),
-                                        (GLsizei) bswap_CARD32(pc + 36),
-                                        (GLsizei) bswap_CARD32(pc + 40),
-                                        (GLenum) bswap_ENUM(pc + 44),
-                                        (GLenum) bswap_ENUM(pc + 48), pixels));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
+
+    glTexSubImage2D((GLenum) bswap_ENUM(pc + 20),
+                    (GLint) bswap_CARD32(pc + 24),
+                    (GLint) bswap_CARD32(pc + 28),
+                    (GLint) bswap_CARD32(pc + 32),
+                    (GLsizei) bswap_CARD32(pc + 36),
+                    (GLsizei) bswap_CARD32(pc + 40),
+                    (GLenum) bswap_ENUM(pc + 44),
+                    (GLenum) bswap_ENUM(pc + 48), pixels);
 }
 
 void
 __glXDispSwap_BlendColor(GLbyte * pc)
 {
-    CALL_BlendColor(GET_DISPATCH(), ((GLclampf) bswap_FLOAT32(pc + 0),
-                                     (GLclampf) bswap_FLOAT32(pc + 4),
-                                     (GLclampf) bswap_FLOAT32(pc + 8),
-                                     (GLclampf) bswap_FLOAT32(pc + 12)
-                    ));
+    glBlendColor((GLclampf) bswap_FLOAT32(pc + 0),
+                 (GLclampf) bswap_FLOAT32(pc + 4),
+                 (GLclampf) bswap_FLOAT32(pc + 8),
+                 (GLclampf) bswap_FLOAT32(pc + 12));
 }
 
 void
 __glXDispSwap_BlendEquation(GLbyte * pc)
 {
-    CALL_BlendEquation(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                       ));
+    glBlendEquation((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
@@ -3408,26 +3031,19 @@ __glXDispSwap_ColorTable(GLbyte * pc)
     const GLvoid *const table = (const GLvoid *) ((pc + 40));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_ColorTable(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                     (GLenum) bswap_ENUM(pc + 24),
-                                     (GLsizei) bswap_CARD32(pc + 28),
-                                     (GLenum) bswap_ENUM(pc + 32),
-                                     (GLenum) bswap_ENUM(pc + 36), table));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
+
+    glColorTable((GLenum) bswap_ENUM(pc + 20),
+                 (GLenum) bswap_ENUM(pc + 24),
+                 (GLsizei) bswap_CARD32(pc + 28),
+                 (GLenum) bswap_ENUM(pc + 32),
+                 (GLenum) bswap_ENUM(pc + 36), table);
 }
 
 void
@@ -3440,8 +3056,7 @@ __glXDispSwap_ColorTableParameterfv(GLbyte * pc)
         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
                                          __glColorTableParameterfv_size(pname));
 
-    CALL_ColorTableParameterfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                pname, params));
+    glColorTableParameterfv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
@@ -3454,19 +3069,17 @@ __glXDispSwap_ColorTableParameteriv(GLbyte * pc)
         (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
                                        __glColorTableParameteriv_size(pname));
 
-    CALL_ColorTableParameteriv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                pname, params));
+    glColorTableParameteriv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
 __glXDispSwap_CopyColorTable(GLbyte * pc)
 {
-    CALL_CopyColorTable(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         (GLenum) bswap_ENUM(pc + 4),
-                                         (GLint) bswap_CARD32(pc + 8),
-                                         (GLint) bswap_CARD32(pc + 12),
-                                         (GLsizei) bswap_CARD32(pc + 16)
-                        ));
+    glCopyColorTable((GLenum) bswap_ENUM(pc + 0),
+                     (GLenum) bswap_ENUM(pc + 4),
+                     (GLint) bswap_CARD32(pc + 8),
+                     (GLint) bswap_CARD32(pc + 12),
+                     (GLsizei) bswap_CARD32(pc + 16));
 }
 
 int
@@ -3491,9 +3104,7 @@ __glXDispSwap_GetColorTableParameterfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameterfv(GET_DISPATCH(), ((GLenum)
-                                                       bswap_ENUM(pc + 0),
-                                                       pname, params));
+        glGetColorTableParameterfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -3524,9 +3135,7 @@ __glXDispSwap_GetColorTableParameterfvSGI(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameterfv(GET_DISPATCH(), ((GLenum)
-                                                       bswap_ENUM(pc + 0),
-                                                       pname, params));
+        glGetColorTableParameterfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -3557,9 +3166,7 @@ __glXDispSwap_GetColorTableParameteriv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameteriv(GET_DISPATCH(), ((GLenum)
-                                                       bswap_ENUM(pc + 0),
-                                                       pname, params));
+        glGetColorTableParameteriv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -3590,9 +3197,7 @@ __glXDispSwap_GetColorTableParameterivSGI(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameteriv(GET_DISPATCH(), ((GLenum)
-                                                       bswap_ENUM(pc + 0),
-                                                       pname, params));
+        glGetColorTableParameteriv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -3607,37 +3212,29 @@ __glXDispSwap_ColorSubTable(GLbyte * pc)
     const GLvoid *const data = (const GLvoid *) ((pc + 40));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_ColorSubTable(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                        (GLsizei) bswap_CARD32(pc + 24),
-                                        (GLsizei) bswap_CARD32(pc + 28),
-                                        (GLenum) bswap_ENUM(pc + 32),
-                                        (GLenum) bswap_ENUM(pc + 36), data));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
+
+    glColorSubTable((GLenum) bswap_ENUM(pc + 20),
+                    (GLsizei) bswap_CARD32(pc + 24),
+                    (GLsizei) bswap_CARD32(pc + 28),
+                    (GLenum) bswap_ENUM(pc + 32),
+                    (GLenum) bswap_ENUM(pc + 36), data);
 }
 
 void
 __glXDispSwap_CopyColorSubTable(GLbyte * pc)
 {
-    CALL_CopyColorSubTable(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            (GLsizei) bswap_CARD32(pc + 4),
-                                            (GLint) bswap_CARD32(pc + 8),
-                                            (GLint) bswap_CARD32(pc + 12),
-                                            (GLsizei) bswap_CARD32(pc + 16)
-                           ));
+    glCopyColorSubTable((GLenum) bswap_ENUM(pc + 0),
+                        (GLsizei) bswap_CARD32(pc + 4),
+                        (GLint) bswap_CARD32(pc + 8),
+                        (GLint) bswap_CARD32(pc + 12),
+                        (GLsizei) bswap_CARD32(pc + 16));
 }
 
 void
@@ -3646,27 +3243,19 @@ __glXDispSwap_ConvolutionFilter1D(GLbyte * pc)
     const GLvoid *const image = (const GLvoid *) ((pc + 44));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_ConvolutionFilter1D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                              (GLenum) bswap_ENUM(pc + 24),
-                                              (GLsizei) bswap_CARD32(pc + 28),
-                                              (GLenum) bswap_ENUM(pc + 36),
-                                              (GLenum) bswap_ENUM(pc + 40),
-                                              image));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
+
+    glConvolutionFilter1D((GLenum) bswap_ENUM(pc + 20),
+                          (GLenum) bswap_ENUM(pc + 24),
+                          (GLsizei) bswap_CARD32(pc + 28),
+                          (GLenum) bswap_ENUM(pc + 36),
+                          (GLenum) bswap_ENUM(pc + 40), image);
 }
 
 void
@@ -3675,37 +3264,28 @@ __glXDispSwap_ConvolutionFilter2D(GLbyte * pc)
     const GLvoid *const image = (const GLvoid *) ((pc + 44));
     __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_ConvolutionFilter2D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                              (GLenum) bswap_ENUM(pc + 24),
-                                              (GLsizei) bswap_CARD32(pc + 28),
-                                              (GLsizei) bswap_CARD32(pc + 32),
-                                              (GLenum) bswap_ENUM(pc + 36),
-                                              (GLenum) bswap_ENUM(pc + 40),
-                                              image));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
+
+    glConvolutionFilter2D((GLenum) bswap_ENUM(pc + 20),
+                          (GLenum) bswap_ENUM(pc + 24),
+                          (GLsizei) bswap_CARD32(pc + 28),
+                          (GLsizei) bswap_CARD32(pc + 32),
+                          (GLenum) bswap_ENUM(pc + 36),
+                          (GLenum) bswap_ENUM(pc + 40), image);
 }
 
 void
 __glXDispSwap_ConvolutionParameterf(GLbyte * pc)
 {
-    CALL_ConvolutionParameterf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                (GLenum) bswap_ENUM(pc + 4),
-                                                (GLfloat) bswap_FLOAT32(pc + 8)
-                               ));
+    glConvolutionParameterf((GLenum) bswap_ENUM(pc + 0),
+                            (GLenum) bswap_ENUM(pc + 4),
+                            (GLfloat) bswap_FLOAT32(pc + 8));
 }
 
 void
@@ -3719,17 +3299,15 @@ __glXDispSwap_ConvolutionParameterfv(GLbyte * pc)
                                          __glConvolutionParameterfv_size
                                          (pname));
 
-    CALL_ConvolutionParameterfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                 pname, params));
+    glConvolutionParameterfv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
 __glXDispSwap_ConvolutionParameteri(GLbyte * pc)
 {
-    CALL_ConvolutionParameteri(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                (GLenum) bswap_ENUM(pc + 4),
-                                                (GLint) bswap_CARD32(pc + 8)
-                               ));
+    glConvolutionParameteri((GLenum) bswap_ENUM(pc + 0),
+                            (GLenum) bswap_ENUM(pc + 4),
+                            (GLint) bswap_CARD32(pc + 8));
 }
 
 void
@@ -3742,34 +3320,28 @@ __glXDispSwap_ConvolutionParameteriv(GLbyte * pc)
         (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
                                        __glConvolutionParameteriv_size(pname));
 
-    CALL_ConvolutionParameteriv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                 pname, params));
+    glConvolutionParameteriv((GLenum) bswap_ENUM(pc + 0), pname, params);
 }
 
 void
 __glXDispSwap_CopyConvolutionFilter1D(GLbyte * pc)
 {
-    CALL_CopyConvolutionFilter1D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLenum) bswap_ENUM(pc + 4),
-                                                  (GLint) bswap_CARD32(pc + 8),
-                                                  (GLint) bswap_CARD32(pc + 12),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         16)
-                                 ));
+    glCopyConvolutionFilter1D((GLenum) bswap_ENUM(pc + 0),
+                              (GLenum) bswap_ENUM(pc + 4),
+                              (GLint) bswap_CARD32(pc + 8),
+                              (GLint) bswap_CARD32(pc + 12),
+                              (GLsizei) bswap_CARD32(pc + 16));
 }
 
 void
 __glXDispSwap_CopyConvolutionFilter2D(GLbyte * pc)
 {
-    CALL_CopyConvolutionFilter2D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLenum) bswap_ENUM(pc + 4),
-                                                  (GLint) bswap_CARD32(pc + 8),
-                                                  (GLint) bswap_CARD32(pc + 12),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         16),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         20)
-                                 ));
+    glCopyConvolutionFilter2D((GLenum) bswap_ENUM(pc + 0),
+                              (GLenum) bswap_ENUM(pc + 4),
+                              (GLint) bswap_CARD32(pc + 8),
+                              (GLint) bswap_CARD32(pc + 12),
+                              (GLsizei) bswap_CARD32(pc + 16),
+                              (GLsizei) bswap_CARD32(pc + 20));
 }
 
 int
@@ -3794,9 +3366,7 @@ __glXDispSwap_GetConvolutionParameterfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameterfv(GET_DISPATCH(), ((GLenum)
-                                                        bswap_ENUM(pc + 0),
-                                                        pname, params));
+        glGetConvolutionParameterfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -3827,9 +3397,7 @@ __glXDispSwap_GetConvolutionParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameterfv(GET_DISPATCH(), ((GLenum)
-                                                        bswap_ENUM(pc + 0),
-                                                        pname, params));
+        glGetConvolutionParameterfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -3860,9 +3428,7 @@ __glXDispSwap_GetConvolutionParameteriv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameteriv(GET_DISPATCH(), ((GLenum)
-                                                        bswap_ENUM(pc + 0),
-                                                        pname, params));
+        glGetConvolutionParameteriv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -3893,9 +3459,7 @@ __glXDispSwap_GetConvolutionParameterivEXT(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameteriv(GET_DISPATCH(), ((GLenum)
-                                                        bswap_ENUM(pc + 0),
-                                                        pname, params));
+        glGetConvolutionParameteriv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -3926,9 +3490,7 @@ __glXDispSwap_GetHistogramParameterfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameterfv(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0), pname,
-                                                      params));
+        glGetHistogramParameterfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -3959,9 +3521,7 @@ __glXDispSwap_GetHistogramParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameterfv(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0), pname,
-                                                      params));
+        glGetHistogramParameterfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -3992,9 +3552,7 @@ __glXDispSwap_GetHistogramParameteriv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameteriv(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0), pname,
-                                                      params));
+        glGetHistogramParameteriv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -4025,9 +3583,7 @@ __glXDispSwap_GetHistogramParameterivEXT(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameteriv(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0), pname,
-                                                      params));
+        glGetHistogramParameteriv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -4058,8 +3614,7 @@ __glXDispSwap_GetMinmaxParameterfv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameterfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                   pname, params));
+        glGetMinmaxParameterfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -4090,8 +3645,7 @@ __glXDispSwap_GetMinmaxParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameterfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                   pname, params));
+        glGetMinmaxParameterfv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -4122,8 +3676,7 @@ __glXDispSwap_GetMinmaxParameteriv(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameteriv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                   pname, params));
+        glGetMinmaxParameteriv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -4154,8 +3707,7 @@ __glXDispSwap_GetMinmaxParameterivEXT(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameteriv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                   pname, params));
+        glGetMinmaxParameteriv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -4167,34 +3719,28 @@ __glXDispSwap_GetMinmaxParameterivEXT(__GLXclientState * cl, GLbyte * pc)
 void
 __glXDispSwap_Histogram(GLbyte * pc)
 {
-    CALL_Histogram(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLsizei) bswap_CARD32(pc + 4),
-                                    (GLenum) bswap_ENUM(pc + 8),
-                                    *(GLboolean *) (pc + 12)
-                   ));
+    glHistogram((GLenum) bswap_ENUM(pc + 0),
+                (GLsizei) bswap_CARD32(pc + 4),
+                (GLenum) bswap_ENUM(pc + 8), *(GLboolean *) (pc + 12));
 }
 
 void
 __glXDispSwap_Minmax(GLbyte * pc)
 {
-    CALL_Minmax(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                 (GLenum) bswap_ENUM(pc + 4),
-                                 *(GLboolean *) (pc + 8)
-                ));
+    glMinmax((GLenum) bswap_ENUM(pc + 0),
+             (GLenum) bswap_ENUM(pc + 4), *(GLboolean *) (pc + 8));
 }
 
 void
 __glXDispSwap_ResetHistogram(GLbyte * pc)
 {
-    CALL_ResetHistogram(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                        ));
+    glResetHistogram((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
 __glXDispSwap_ResetMinmax(GLbyte * pc)
 {
-    CALL_ResetMinmax(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                     ));
+    glResetMinmax((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
@@ -4205,36 +3751,27 @@ __glXDispSwap_TexImage3D(GLbyte * pc)
         (const GLvoid *) ((ptr_is_null != 0) ? NULL : (pc + 80));
     __GLXpixel3DHeader *const hdr = (__GLXpixel3DHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_IMAGE_HEIGHT,
-                      (GLint) bswap_CARD32(&hdr->imageHeight)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_IMAGES,
-                      (GLint) bswap_CARD32(&hdr->skipImages)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_TexImage3D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 36),
-                                     (GLint) bswap_CARD32(pc + 40),
-                                     (GLint) bswap_CARD32(pc + 44),
-                                     (GLsizei) bswap_CARD32(pc + 48),
-                                     (GLsizei) bswap_CARD32(pc + 52),
-                                     (GLsizei) bswap_CARD32(pc + 56),
-                                     (GLint) bswap_CARD32(pc + 64),
-                                     (GLenum) bswap_ENUM(pc + 68),
-                                     (GLenum) bswap_ENUM(pc + 72), pixels));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_IMAGE_HEIGHT,
+                  (GLint) bswap_CARD32(&hdr->imageHeight));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_IMAGES,
+                  (GLint) bswap_CARD32(&hdr->skipImages));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
+
+    glTexImage3D((GLenum) bswap_ENUM(pc + 36),
+                 (GLint) bswap_CARD32(pc + 40),
+                 (GLint) bswap_CARD32(pc + 44),
+                 (GLsizei) bswap_CARD32(pc + 48),
+                 (GLsizei) bswap_CARD32(pc + 52),
+                 (GLsizei) bswap_CARD32(pc + 56),
+                 (GLint) bswap_CARD32(pc + 64),
+                 (GLenum) bswap_ENUM(pc + 68),
+                 (GLenum) bswap_ENUM(pc + 72), pixels);
 }
 
 void
@@ -4243,63 +3780,52 @@ __glXDispSwap_TexSubImage3D(GLbyte * pc)
     const GLvoid *const pixels = (const GLvoid *) ((pc + 88));
     __GLXpixel3DHeader *const hdr = (__GLXpixel3DHeader *) (pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_IMAGE_HEIGHT,
-                      (GLint) bswap_CARD32(&hdr->imageHeight)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_IMAGES,
-                      (GLint) bswap_CARD32(&hdr->skipImages)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_TexSubImage3D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 36),
-                                        (GLint) bswap_CARD32(pc + 40),
-                                        (GLint) bswap_CARD32(pc + 44),
-                                        (GLint) bswap_CARD32(pc + 48),
-                                        (GLint) bswap_CARD32(pc + 52),
-                                        (GLsizei) bswap_CARD32(pc + 60),
-                                        (GLsizei) bswap_CARD32(pc + 64),
-                                        (GLsizei) bswap_CARD32(pc + 68),
-                                        (GLenum) bswap_ENUM(pc + 76),
-                                        (GLenum) bswap_ENUM(pc + 80), pixels));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) bswap_CARD32(&hdr->rowLength));
+    glPixelStorei(GL_UNPACK_IMAGE_HEIGHT,
+                  (GLint) bswap_CARD32(&hdr->imageHeight));
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) bswap_CARD32(&hdr->skipRows));
+    glPixelStorei(GL_UNPACK_SKIP_IMAGES,
+                  (GLint) bswap_CARD32(&hdr->skipImages));
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS,
+                  (GLint) bswap_CARD32(&hdr->skipPixels));
+    glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) bswap_CARD32(&hdr->alignment));
+
+    glTexSubImage3D((GLenum) bswap_ENUM(pc + 36),
+                    (GLint) bswap_CARD32(pc + 40),
+                    (GLint) bswap_CARD32(pc + 44),
+                    (GLint) bswap_CARD32(pc + 48),
+                    (GLint) bswap_CARD32(pc + 52),
+                    (GLsizei) bswap_CARD32(pc + 60),
+                    (GLsizei) bswap_CARD32(pc + 64),
+                    (GLsizei) bswap_CARD32(pc + 68),
+                    (GLenum) bswap_ENUM(pc + 76),
+                    (GLenum) bswap_ENUM(pc + 80), pixels);
 }
 
 void
 __glXDispSwap_CopyTexSubImage3D(GLbyte * pc)
 {
-    CALL_CopyTexSubImage3D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            (GLint) bswap_CARD32(pc + 4),
-                                            (GLint) bswap_CARD32(pc + 8),
-                                            (GLint) bswap_CARD32(pc + 12),
-                                            (GLint) bswap_CARD32(pc + 16),
-                                            (GLint) bswap_CARD32(pc + 20),
-                                            (GLint) bswap_CARD32(pc + 24),
-                                            (GLsizei) bswap_CARD32(pc + 28),
-                                            (GLsizei) bswap_CARD32(pc + 32)
-                           ));
+    glCopyTexSubImage3D((GLenum) bswap_ENUM(pc + 0),
+                        (GLint) bswap_CARD32(pc + 4),
+                        (GLint) bswap_CARD32(pc + 8),
+                        (GLint) bswap_CARD32(pc + 12),
+                        (GLint) bswap_CARD32(pc + 16),
+                        (GLint) bswap_CARD32(pc + 20),
+                        (GLint) bswap_CARD32(pc + 24),
+                        (GLsizei) bswap_CARD32(pc + 28),
+                        (GLsizei) bswap_CARD32(pc + 32));
 }
 
 void
-__glXDispSwap_ActiveTextureARB(GLbyte * pc)
+__glXDispSwap_ActiveTexture(GLbyte * pc)
 {
-    CALL_ActiveTextureARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                          ));
+    glActiveTexture((GLenum) bswap_ENUM(pc + 0));
 }
 
 void
-__glXDispSwap_MultiTexCoord1dvARB(GLbyte * pc)
+__glXDispSwap_MultiTexCoord1dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -4308,49 +3834,37 @@ __glXDispSwap_MultiTexCoord1dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_MultiTexCoord1dvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 8),
-                                              (const GLdouble *)
-                                              bswap_64_array((uint64_t *) (pc +
-                                                                           0),
-                                                             1)
-                             ));
+    glMultiTexCoord1dv((GLenum) bswap_ENUM(pc + 8),
+                       (const GLdouble *) bswap_64_array((uint64_t *) (pc + 0),
+                                                         1));
 }
 
 void
 __glXDispSwap_MultiTexCoord1fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord1fvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLfloat *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             1)
-                             ));
+    glMultiTexCoord1fvARB((GLenum) bswap_ENUM(pc + 0),
+                          (const GLfloat *)
+                          bswap_32_array((uint32_t *) (pc + 4), 1));
 }
 
 void
-__glXDispSwap_MultiTexCoord1ivARB(GLbyte * pc)
+__glXDispSwap_MultiTexCoord1iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord1ivARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLint *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             1)
-                             ));
+    glMultiTexCoord1iv((GLenum) bswap_ENUM(pc + 0),
+                       (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                      1));
 }
 
 void
-__glXDispSwap_MultiTexCoord1svARB(GLbyte * pc)
+__glXDispSwap_MultiTexCoord1sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord1svARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLshort *)
-                                              bswap_16_array((uint16_t *) (pc +
-                                                                           4),
-                                                             1)
-                             ));
+    glMultiTexCoord1sv((GLenum) bswap_ENUM(pc + 0),
+                       (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                        1));
 }
 
 void
-__glXDispSwap_MultiTexCoord2dvARB(GLbyte * pc)
+__glXDispSwap_MultiTexCoord2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -4359,49 +3873,37 @@ __glXDispSwap_MultiTexCoord2dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_MultiTexCoord2dvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 16),
-                                              (const GLdouble *)
-                                              bswap_64_array((uint64_t *) (pc +
-                                                                           0),
-                                                             2)
-                             ));
+    glMultiTexCoord2dv((GLenum) bswap_ENUM(pc + 16),
+                       (const GLdouble *) bswap_64_array((uint64_t *) (pc + 0),
+                                                         2));
 }
 
 void
 __glXDispSwap_MultiTexCoord2fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord2fvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLfloat *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             2)
-                             ));
+    glMultiTexCoord2fvARB((GLenum) bswap_ENUM(pc + 0),
+                          (const GLfloat *)
+                          bswap_32_array((uint32_t *) (pc + 4), 2));
 }
 
 void
-__glXDispSwap_MultiTexCoord2ivARB(GLbyte * pc)
+__glXDispSwap_MultiTexCoord2iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord2ivARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLint *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             2)
-                             ));
+    glMultiTexCoord2iv((GLenum) bswap_ENUM(pc + 0),
+                       (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                      2));
 }
 
 void
-__glXDispSwap_MultiTexCoord2svARB(GLbyte * pc)
+__glXDispSwap_MultiTexCoord2sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord2svARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLshort *)
-                                              bswap_16_array((uint16_t *) (pc +
-                                                                           4),
-                                                             2)
-                             ));
+    glMultiTexCoord2sv((GLenum) bswap_ENUM(pc + 0),
+                       (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                        2));
 }
 
 void
-__glXDispSwap_MultiTexCoord3dvARB(GLbyte * pc)
+__glXDispSwap_MultiTexCoord3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -4410,49 +3912,37 @@ __glXDispSwap_MultiTexCoord3dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_MultiTexCoord3dvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 24),
-                                              (const GLdouble *)
-                                              bswap_64_array((uint64_t *) (pc +
-                                                                           0),
-                                                             3)
-                             ));
+    glMultiTexCoord3dv((GLenum) bswap_ENUM(pc + 24),
+                       (const GLdouble *) bswap_64_array((uint64_t *) (pc + 0),
+                                                         3));
 }
 
 void
 __glXDispSwap_MultiTexCoord3fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord3fvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLfloat *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             3)
-                             ));
+    glMultiTexCoord3fvARB((GLenum) bswap_ENUM(pc + 0),
+                          (const GLfloat *)
+                          bswap_32_array((uint32_t *) (pc + 4), 3));
 }
 
 void
-__glXDispSwap_MultiTexCoord3ivARB(GLbyte * pc)
+__glXDispSwap_MultiTexCoord3iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord3ivARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLint *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             3)
-                             ));
+    glMultiTexCoord3iv((GLenum) bswap_ENUM(pc + 0),
+                       (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                      3));
 }
 
 void
-__glXDispSwap_MultiTexCoord3svARB(GLbyte * pc)
+__glXDispSwap_MultiTexCoord3sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord3svARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLshort *)
-                                              bswap_16_array((uint16_t *) (pc +
-                                                                           4),
-                                                             3)
-                             ));
+    glMultiTexCoord3sv((GLenum) bswap_ENUM(pc + 0),
+                       (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                        3));
 }
 
 void
-__glXDispSwap_MultiTexCoord4dvARB(GLbyte * pc)
+__glXDispSwap_MultiTexCoord4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -4461,277 +3951,302 @@ __glXDispSwap_MultiTexCoord4dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_MultiTexCoord4dvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 32),
-                                              (const GLdouble *)
-                                              bswap_64_array((uint64_t *) (pc +
-                                                                           0),
-                                                             4)
-                             ));
+    glMultiTexCoord4dv((GLenum) bswap_ENUM(pc + 32),
+                       (const GLdouble *) bswap_64_array((uint64_t *) (pc + 0),
+                                                         4));
 }
 
 void
 __glXDispSwap_MultiTexCoord4fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord4fvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLfloat *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    glMultiTexCoord4fvARB((GLenum) bswap_ENUM(pc + 0),
+                          (const GLfloat *)
+                          bswap_32_array((uint32_t *) (pc + 4), 4));
 }
 
 void
-__glXDispSwap_MultiTexCoord4ivARB(GLbyte * pc)
+__glXDispSwap_MultiTexCoord4iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord4ivARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLint *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    glMultiTexCoord4iv((GLenum) bswap_ENUM(pc + 0),
+                       (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                      4));
 }
 
 void
-__glXDispSwap_MultiTexCoord4svARB(GLbyte * pc)
+__glXDispSwap_MultiTexCoord4sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord4svARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLshort *)
-                                              bswap_16_array((uint16_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    glMultiTexCoord4sv((GLenum) bswap_ENUM(pc + 0),
+                       (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                        4));
 }
 
 void
-__glXDispSwap_SampleCoverageARB(GLbyte * pc)
-{
-    CALL_SampleCoverageARB(GET_DISPATCH(), ((GLclampf) bswap_FLOAT32(pc + 0),
-                                            *(GLboolean *) (pc + 4)
-                           ));
-}
-
-void
-__glXDispSwap_CompressedTexImage1DARB(GLbyte * pc)
+__glXDispSwap_CompressedTexImage1D(GLbyte * pc)
 {
     const GLsizei imageSize = (GLsizei) bswap_CARD32(pc + 20);
 
-    CALL_CompressedTexImage1DARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLint) bswap_CARD32(pc + 4),
-                                                  (GLenum) bswap_ENUM(pc + 8),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         12),
-                                                  (GLint) bswap_CARD32(pc + 16),
-                                                  imageSize,
-                                                  (const GLvoid *) (pc + 24)
-                                 ));
+    glCompressedTexImage1D((GLenum) bswap_ENUM(pc + 0),
+                           (GLint) bswap_CARD32(pc + 4),
+                           (GLenum) bswap_ENUM(pc + 8),
+                           (GLsizei) bswap_CARD32(pc + 12),
+                           (GLint) bswap_CARD32(pc + 16),
+                           imageSize, (const GLvoid *) (pc + 24));
 }
 
 void
-__glXDispSwap_CompressedTexImage2DARB(GLbyte * pc)
+__glXDispSwap_CompressedTexImage2D(GLbyte * pc)
 {
     const GLsizei imageSize = (GLsizei) bswap_CARD32(pc + 24);
 
-    CALL_CompressedTexImage2DARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLint) bswap_CARD32(pc + 4),
-                                                  (GLenum) bswap_ENUM(pc + 8),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         12),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         16),
-                                                  (GLint) bswap_CARD32(pc + 20),
-                                                  imageSize,
-                                                  (const GLvoid *) (pc + 28)
-                                 ));
+    glCompressedTexImage2D((GLenum) bswap_ENUM(pc + 0),
+                           (GLint) bswap_CARD32(pc + 4),
+                           (GLenum) bswap_ENUM(pc + 8),
+                           (GLsizei) bswap_CARD32(pc + 12),
+                           (GLsizei) bswap_CARD32(pc + 16),
+                           (GLint) bswap_CARD32(pc + 20),
+                           imageSize, (const GLvoid *) (pc + 28));
 }
 
 void
-__glXDispSwap_CompressedTexImage3DARB(GLbyte * pc)
+__glXDispSwap_CompressedTexImage3D(GLbyte * pc)
 {
     const GLsizei imageSize = (GLsizei) bswap_CARD32(pc + 28);
 
-    CALL_CompressedTexImage3DARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLint) bswap_CARD32(pc + 4),
-                                                  (GLenum) bswap_ENUM(pc + 8),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         12),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         16),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         20),
-                                                  (GLint) bswap_CARD32(pc + 24),
-                                                  imageSize,
-                                                  (const GLvoid *) (pc + 32)
-                                 ));
+    glCompressedTexImage3D((GLenum) bswap_ENUM(pc + 0),
+                           (GLint) bswap_CARD32(pc + 4),
+                           (GLenum) bswap_ENUM(pc + 8),
+                           (GLsizei) bswap_CARD32(pc + 12),
+                           (GLsizei) bswap_CARD32(pc + 16),
+                           (GLsizei) bswap_CARD32(pc + 20),
+                           (GLint) bswap_CARD32(pc + 24),
+                           imageSize, (const GLvoid *) (pc + 32));
 }
 
 void
-__glXDispSwap_CompressedTexSubImage1DARB(GLbyte * pc)
+__glXDispSwap_CompressedTexSubImage1D(GLbyte * pc)
 {
     const GLsizei imageSize = (GLsizei) bswap_CARD32(pc + 20);
 
-    CALL_CompressedTexSubImage1DARB(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          4),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          8),
-                                                     (GLsizei) bswap_CARD32(pc +
-                                                                            12),
-                                                     (GLenum) bswap_ENUM(pc +
-                                                                         16),
-                                                     imageSize,
-                                                     (const GLvoid *) (pc + 24)
-                                    ));
+    glCompressedTexSubImage1D((GLenum) bswap_ENUM(pc + 0),
+                              (GLint) bswap_CARD32(pc + 4),
+                              (GLint) bswap_CARD32(pc + 8),
+                              (GLsizei) bswap_CARD32(pc + 12),
+                              (GLenum) bswap_ENUM(pc + 16),
+                              imageSize, (const GLvoid *) (pc + 24));
 }
 
 void
-__glXDispSwap_CompressedTexSubImage2DARB(GLbyte * pc)
+__glXDispSwap_CompressedTexSubImage2D(GLbyte * pc)
 {
     const GLsizei imageSize = (GLsizei) bswap_CARD32(pc + 28);
 
-    CALL_CompressedTexSubImage2DARB(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          4),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          8),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          12),
-                                                     (GLsizei) bswap_CARD32(pc +
-                                                                            16),
-                                                     (GLsizei) bswap_CARD32(pc +
-                                                                            20),
-                                                     (GLenum) bswap_ENUM(pc +
-                                                                         24),
-                                                     imageSize,
-                                                     (const GLvoid *) (pc + 32)
-                                    ));
+    glCompressedTexSubImage2D((GLenum) bswap_ENUM(pc + 0),
+                              (GLint) bswap_CARD32(pc + 4),
+                              (GLint) bswap_CARD32(pc + 8),
+                              (GLint) bswap_CARD32(pc + 12),
+                              (GLsizei) bswap_CARD32(pc + 16),
+                              (GLsizei) bswap_CARD32(pc + 20),
+                              (GLenum) bswap_ENUM(pc + 24),
+                              imageSize, (const GLvoid *) (pc + 32));
 }
 
 void
-__glXDispSwap_CompressedTexSubImage3DARB(GLbyte * pc)
+__glXDispSwap_CompressedTexSubImage3D(GLbyte * pc)
 {
     const GLsizei imageSize = (GLsizei) bswap_CARD32(pc + 36);
 
-    CALL_CompressedTexSubImage3DARB(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          4),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          8),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          12),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          16),
-                                                     (GLsizei) bswap_CARD32(pc +
-                                                                            20),
-                                                     (GLsizei) bswap_CARD32(pc +
-                                                                            24),
-                                                     (GLsizei) bswap_CARD32(pc +
-                                                                            28),
-                                                     (GLenum) bswap_ENUM(pc +
-                                                                         32),
-                                                     imageSize,
-                                                     (const GLvoid *) (pc + 40)
-                                    ));
+    glCompressedTexSubImage3D((GLenum) bswap_ENUM(pc + 0),
+                              (GLint) bswap_CARD32(pc + 4),
+                              (GLint) bswap_CARD32(pc + 8),
+                              (GLint) bswap_CARD32(pc + 12),
+                              (GLint) bswap_CARD32(pc + 16),
+                              (GLsizei) bswap_CARD32(pc + 20),
+                              (GLsizei) bswap_CARD32(pc + 24),
+                              (GLsizei) bswap_CARD32(pc + 28),
+                              (GLenum) bswap_ENUM(pc + 32),
+                              imageSize, (const GLvoid *) (pc + 40));
 }
 
-int
-__glXDispSwap_GetProgramEnvParameterdvARB(__GLXclientState * cl, GLbyte * pc)
+void
+__glXDispSwap_SampleCoverage(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    glSampleCoverage((GLclampf) bswap_FLOAT32(pc + 0), *(GLboolean *) (pc + 4));
+}
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLdouble params[4];
+void
+__glXDispSwap_BlendFuncSeparate(GLbyte * pc)
+{
+    glBlendFuncSeparate((GLenum) bswap_ENUM(pc + 0),
+                        (GLenum) bswap_ENUM(pc + 4),
+                        (GLenum) bswap_ENUM(pc + 8),
+                        (GLenum) bswap_ENUM(pc + 12));
+}
 
-        CALL_GetProgramEnvParameterdvARB(GET_DISPATCH(), ((GLenum)
-                                                          bswap_ENUM(pc + 0),
-                                                          (GLuint)
-                                                          bswap_CARD32(pc + 4),
-                                                          params));
-        (void) bswap_64_array((uint64_t *) params, 4);
-        __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
-        error = Success;
+void
+__glXDispSwap_FogCoorddv(GLbyte * pc)
+{
+#ifdef __GLX_ALIGN64
+    if ((unsigned long) (pc) & 7) {
+        (void) memmove(pc - 4, pc, 8);
+        pc -= 4;
     }
+#endif
 
-    return error;
+    glFogCoorddv((const GLdouble *) bswap_64_array((uint64_t *) (pc + 0), 1));
 }
 
-int
-__glXDispSwap_GetProgramEnvParameterfvARB(__GLXclientState * cl, GLbyte * pc)
+void
+__glXDispSwap_PointParameterf(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    glPointParameterf((GLenum) bswap_ENUM(pc + 0),
+                      (GLfloat) bswap_FLOAT32(pc + 4));
+}
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLfloat params[4];
+void
+__glXDispSwap_PointParameterfv(GLbyte * pc)
+{
+    const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
+    const GLfloat *params;
 
-        CALL_GetProgramEnvParameterfvARB(GET_DISPATCH(), ((GLenum)
-                                                          bswap_ENUM(pc + 0),
-                                                          (GLuint)
-                                                          bswap_CARD32(pc + 4),
-                                                          params));
-        (void) bswap_32_array((uint32_t *) params, 4);
-        __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
-        error = Success;
+    params =
+        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
+                                         __glPointParameterfv_size(pname));
+
+    glPointParameterfv(pname, params);
+}
+
+void
+__glXDispSwap_PointParameteri(GLbyte * pc)
+{
+    glPointParameteri((GLenum) bswap_ENUM(pc + 0),
+                      (GLint) bswap_CARD32(pc + 4));
+}
+
+void
+__glXDispSwap_PointParameteriv(GLbyte * pc)
+{
+    const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
+    const GLint *params;
+
+    params =
+        (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
+                                       __glPointParameteriv_size(pname));
+
+    glPointParameteriv(pname, params);
+}
+
+void
+__glXDispSwap_SecondaryColor3bv(GLbyte * pc)
+{
+    glSecondaryColor3bv((const GLbyte *) (pc + 0));
+}
+
+void
+__glXDispSwap_SecondaryColor3dv(GLbyte * pc)
+{
+#ifdef __GLX_ALIGN64
+    if ((unsigned long) (pc) & 7) {
+        (void) memmove(pc - 4, pc, 24);
+        pc -= 4;
     }
+#endif
 
-    return error;
+    glSecondaryColor3dv((const GLdouble *)
+                        bswap_64_array((uint64_t *) (pc + 0), 3));
+}
+
+void
+__glXDispSwap_SecondaryColor3iv(GLbyte * pc)
+{
+    glSecondaryColor3iv((const GLint *)
+                        bswap_32_array((uint32_t *) (pc + 0), 3));
+}
+
+void
+__glXDispSwap_SecondaryColor3sv(GLbyte * pc)
+{
+    glSecondaryColor3sv((const GLshort *)
+                        bswap_16_array((uint16_t *) (pc + 0), 3));
+}
+
+void
+__glXDispSwap_SecondaryColor3ubv(GLbyte * pc)
+{
+    glSecondaryColor3ubv((const GLubyte *) (pc + 0));
+}
+
+void
+__glXDispSwap_SecondaryColor3uiv(GLbyte * pc)
+{
+    glSecondaryColor3uiv((const GLuint *)
+                         bswap_32_array((uint32_t *) (pc + 0), 3));
+}
+
+void
+__glXDispSwap_SecondaryColor3usv(GLbyte * pc)
+{
+    glSecondaryColor3usv((const GLushort *)
+                         bswap_16_array((uint16_t *) (pc + 0), 3));
+}
+
+void
+__glXDispSwap_WindowPos3fv(GLbyte * pc)
+{
+    glWindowPos3fv((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 3));
+}
+
+void
+__glXDispSwap_BeginQuery(GLbyte * pc)
+{
+    glBeginQuery((GLenum) bswap_ENUM(pc + 0), (GLuint) bswap_CARD32(pc + 4));
 }
 
 int
-__glXDispSwap_GetProgramLocalParameterdvARB(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_DeleteQueries(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
     __GLXcontext *const cx =
         __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
+    pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        GLdouble params[4];
+        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
 
-        CALL_GetProgramLocalParameterdvARB(GET_DISPATCH(), ((GLenum)
-                                                            bswap_ENUM(pc + 0),
-                                                            (GLuint)
-                                                            bswap_CARD32(pc +
-                                                                         4),
-                                                            params));
-        (void) bswap_64_array((uint64_t *) params, 4);
-        __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
+        glDeleteQueries(n,
+                        (const GLuint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                        0));
         error = Success;
     }
 
     return error;
 }
 
+void
+__glXDispSwap_EndQuery(GLbyte * pc)
+{
+    glEndQuery((GLenum) bswap_ENUM(pc + 0));
+}
+
 int
-__glXDispSwap_GetProgramLocalParameterfvARB(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_GenQueries(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
     __GLXcontext *const cx =
         __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
+    pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        GLfloat params[4];
+        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
 
-        CALL_GetProgramLocalParameterfvARB(GET_DISPATCH(), ((GLenum)
-                                                            bswap_ENUM(pc + 0),
-                                                            (GLuint)
-                                                            bswap_CARD32(pc +
-                                                                         4),
-                                                            params));
-        (void) bswap_32_array((uint32_t *) params, 4);
-        __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
+        GLuint answerBuffer[200];
+        GLuint *ids =
+            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
+                                 4);
+        glGenQueries(n, ids);
+        (void) bswap_32_array((uint32_t *) ids, n);
+        __glXSendReplySwap(cl->client, ids, n, 4, GL_TRUE, 0);
         error = Success;
     }
 
@@ -4739,18 +4254,18 @@ __glXDispSwap_GetProgramLocalParameterfvARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetProgramivARB(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_GetQueryObjectiv(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
     __GLXcontext *const cx =
         __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
+    pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
         const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
 
-        const GLuint compsize = __glGetProgramivARB_size(pname);
+        const GLuint compsize = __glGetQueryObjectiv_size(pname);
         GLint answerBuffer[200];
         GLint *params =
             __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
@@ -4760,8 +4275,7 @@ __glXDispSwap_GetProgramivARB(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetProgramivARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              pname, params));
+        glGetQueryObjectiv((GLuint) bswap_CARD32(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -4771,32 +4285,30 @@ __glXDispSwap_GetProgramivARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetVertexAttribdvARB(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_GetQueryObjectuiv(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
     __GLXcontext *const cx =
         __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
+    pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
         const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
 
-        const GLuint compsize = __glGetVertexAttribdvARB_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble *params =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
+        const GLuint compsize = __glGetQueryObjectuiv_size(pname);
+        GLuint answerBuffer[200];
+        GLuint *params =
+            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
+                                 sizeof(answerBuffer), 4);
 
         if (params == NULL)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribdvARB(GET_DISPATCH(), ((GLuint)
-                                                   bswap_CARD32(pc + 0), pname,
-                                                   params));
-        (void) bswap_64_array((uint64_t *) params, compsize);
-        __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
+        glGetQueryObjectuiv((GLuint) bswap_CARD32(pc + 0), pname, params);
+        (void) bswap_32_array((uint32_t *) params, compsize);
+        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
 
@@ -4804,20 +4316,20 @@ __glXDispSwap_GetVertexAttribdvARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_GetQueryiv(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
     __GLXcontext *const cx =
         __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
+    pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
         const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
 
-        const GLuint compsize = __glGetVertexAttribfvARB_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat *params =
+        const GLuint compsize = __glGetQueryiv_size(pname);
+        GLint answerBuffer[200];
+        GLint *params =
             __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
                                  sizeof(answerBuffer), 4);
 
@@ -4825,9 +4337,7 @@ __glXDispSwap_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribfvARB(GET_DISPATCH(), ((GLuint)
-                                                   bswap_CARD32(pc + 0), pname,
-                                                   params));
+        glGetQueryiv((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -4837,32 +4347,19 @@ __glXDispSwap_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetVertexAttribivARB(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_IsQuery(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
     __GLXcontext *const cx =
         __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
+    pc += __GLX_SINGLE_HDR_SIZE;
     if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-
-        const GLuint compsize = __glGetVertexAttribivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
-
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+        GLboolean retval;
 
-        CALL_GetVertexAttribivARB(GET_DISPATCH(), ((GLuint)
-                                                   bswap_CARD32(pc + 0), pname,
-                                                   params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        retval = glIsQuery((GLuint) bswap_CARD32(pc + 0));
+        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
 
@@ -4870,86 +4367,22 @@ __glXDispSwap_GetVertexAttribivARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 void
-__glXDispSwap_ProgramEnvParameter4dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 40);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramEnvParameter4dvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                    (GLuint) bswap_CARD32(pc +
-                                                                          4),
-                                                    (const GLdouble *)
-                                                    bswap_64_array((uint64_t
-                                                                    *) (pc + 8),
-                                                                   4)
-                                   ));
-}
-
-void
-__glXDispSwap_ProgramEnvParameter4fvARB(GLbyte * pc)
-{
-    CALL_ProgramEnvParameter4fvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                    (GLuint) bswap_CARD32(pc +
-                                                                          4),
-                                                    (const GLfloat *)
-                                                    bswap_32_array((uint32_t
-                                                                    *) (pc + 8),
-                                                                   4)
-                                   ));
-}
-
-void
-__glXDispSwap_ProgramLocalParameter4dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 40);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramLocalParameter4dvARB(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0),
-                                                      (GLuint) bswap_CARD32(pc +
-                                                                            4),
-                                                      (const GLdouble *)
-                                                      bswap_64_array((uint64_t
-                                                                      *) (pc +
-                                                                          8), 4)
-                                     ));
-}
-
-void
-__glXDispSwap_ProgramLocalParameter4fvARB(GLbyte * pc)
+__glXDispSwap_BlendEquationSeparate(GLbyte * pc)
 {
-    CALL_ProgramLocalParameter4fvARB(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0),
-                                                      (GLuint) bswap_CARD32(pc +
-                                                                            4),
-                                                      (const GLfloat *)
-                                                      bswap_32_array((uint32_t
-                                                                      *) (pc +
-                                                                          8), 4)
-                                     ));
+    glBlendEquationSeparate((GLenum) bswap_ENUM(pc + 0),
+                            (GLenum) bswap_ENUM(pc + 4));
 }
 
 void
-__glXDispSwap_ProgramStringARB(GLbyte * pc)
+__glXDispSwap_DrawBuffers(GLbyte * pc)
 {
-    const GLsizei len = (GLsizei) bswap_CARD32(pc + 8);
+    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
 
-    CALL_ProgramStringARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                           (GLenum) bswap_ENUM(pc + 4),
-                                           len, (const GLvoid *) (pc + 12)
-                          ));
+    glDrawBuffers(n, (const GLenum *) bswap_32_array((uint32_t *) (pc + 4), 0));
 }
 
 void
-__glXDispSwap_VertexAttrib1dvARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib1dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -4958,35 +4391,21 @@ __glXDispSwap_VertexAttrib1dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib1dvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          4), 1)
-                            ));
-}
-
-void
-__glXDispSwap_VertexAttrib1fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib1fvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 1)
-                            ));
+    glVertexAttrib1dv((GLuint) bswap_CARD32(pc + 0),
+                      (const GLdouble *) bswap_64_array((uint64_t *) (pc + 4),
+                                                        1));
 }
 
 void
-__glXDispSwap_VertexAttrib1svARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib1sv(GLbyte * pc)
 {
-    CALL_VertexAttrib1svARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          4), 1)
-                            ));
+    glVertexAttrib1sv((GLuint) bswap_CARD32(pc + 0),
+                      (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                       1));
 }
 
 void
-__glXDispSwap_VertexAttrib2dvARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -4995,35 +4414,21 @@ __glXDispSwap_VertexAttrib2dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib2dvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          4), 2)
-                            ));
+    glVertexAttrib2dv((GLuint) bswap_CARD32(pc + 0),
+                      (const GLdouble *) bswap_64_array((uint64_t *) (pc + 4),
+                                                        2));
 }
 
 void
-__glXDispSwap_VertexAttrib2fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib2fvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 2)
-                            ));
-}
-
-void
-__glXDispSwap_VertexAttrib2svARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib2sv(GLbyte * pc)
 {
-    CALL_VertexAttrib2svARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          4), 2)
-                            ));
+    glVertexAttrib2sv((GLuint) bswap_CARD32(pc + 0),
+                      (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                       2));
 }
 
 void
-__glXDispSwap_VertexAttrib3dvARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -5032,103 +4437,73 @@ __glXDispSwap_VertexAttrib3dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib3dvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          4), 3)
-                            ));
+    glVertexAttrib3dv((GLuint) bswap_CARD32(pc + 0),
+                      (const GLdouble *) bswap_64_array((uint64_t *) (pc + 4),
+                                                        3));
 }
 
 void
-__glXDispSwap_VertexAttrib3fvARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib3sv(GLbyte * pc)
 {
-    CALL_VertexAttrib3fvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 3)
-                            ));
+    glVertexAttrib3sv((GLuint) bswap_CARD32(pc + 0),
+                      (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                       3));
 }
 
 void
-__glXDispSwap_VertexAttrib3svARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4Nbv(GLbyte * pc)
 {
-    CALL_VertexAttrib3svARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          4), 3)
-                            ));
+    glVertexAttrib4Nbv((GLuint) bswap_CARD32(pc + 0),
+                       (const GLbyte *) (pc + 4));
 }
 
 void
-__glXDispSwap_VertexAttrib4NbvARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4Niv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NbvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              (const GLbyte *) (pc + 4)
-                             ));
+    glVertexAttrib4Niv((GLuint) bswap_CARD32(pc + 0),
+                       (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                      4));
 }
 
 void
-__glXDispSwap_VertexAttrib4NivARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4Nsv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NivARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              (const GLint *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    glVertexAttrib4Nsv((GLuint) bswap_CARD32(pc + 0),
+                       (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                        4));
 }
 
 void
-__glXDispSwap_VertexAttrib4NsvARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4Nubv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NsvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              (const GLshort *)
-                                              bswap_16_array((uint16_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    glVertexAttrib4Nubv((GLuint) bswap_CARD32(pc + 0),
+                        (const GLubyte *) (pc + 4));
 }
 
 void
-__glXDispSwap_VertexAttrib4NubvARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4Nuiv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NubvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                               (const GLubyte *) (pc + 4)
-                              ));
+    glVertexAttrib4Nuiv((GLuint) bswap_CARD32(pc + 0),
+                        (const GLuint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                        4));
 }
 
 void
-__glXDispSwap_VertexAttrib4NuivARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4Nusv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NuivARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                               (const GLuint *)
-                                               bswap_32_array((uint32_t *) (pc +
-                                                                            4),
-                                                              4)
-                              ));
+    glVertexAttrib4Nusv((GLuint) bswap_CARD32(pc + 0),
+                        (const GLushort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                          4));
 }
 
 void
-__glXDispSwap_VertexAttrib4NusvARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4bv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NusvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                               (const GLushort *)
-                                               bswap_16_array((uint16_t *) (pc +
-                                                                            4),
-                                                              4)
-                              ));
+    glVertexAttrib4bv((GLuint) bswap_CARD32(pc + 0), (const GLbyte *) (pc + 4));
 }
 
 void
-__glXDispSwap_VertexAttrib4bvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4bvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLbyte *) (pc + 4)
-                            ));
-}
-
-void
-__glXDispSwap_VertexAttrib4dvARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
@@ -5137,131 +4512,102 @@ __glXDispSwap_VertexAttrib4dvARB(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib4dvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          4), 4)
-                            ));
+    glVertexAttrib4dv((GLuint) bswap_CARD32(pc + 0),
+                      (const GLdouble *) bswap_64_array((uint64_t *) (pc + 4),
+                                                        4));
 }
 
 void
-__glXDispSwap_VertexAttrib4fvARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4iv(GLbyte * pc)
 {
-    CALL_VertexAttrib4fvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 4)
-                            ));
+    glVertexAttrib4iv((GLuint) bswap_CARD32(pc + 0),
+                      (const GLint *) bswap_32_array((uint32_t *) (pc + 4), 4));
 }
 
 void
-__glXDispSwap_VertexAttrib4ivARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4sv(GLbyte * pc)
 {
-    CALL_VertexAttrib4ivARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLint *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 4)
-                            ));
+    glVertexAttrib4sv((GLuint) bswap_CARD32(pc + 0),
+                      (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                       4));
 }
 
 void
-__glXDispSwap_VertexAttrib4svARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4ubv(GLbyte * pc)
 {
-    CALL_VertexAttrib4svARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          4), 4)
-                            ));
+    glVertexAttrib4ubv((GLuint) bswap_CARD32(pc + 0),
+                       (const GLubyte *) (pc + 4));
 }
 
 void
-__glXDispSwap_VertexAttrib4ubvARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4uiv(GLbyte * pc)
 {
-    CALL_VertexAttrib4ubvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              (const GLubyte *) (pc + 4)
-                             ));
+    glVertexAttrib4uiv((GLuint) bswap_CARD32(pc + 0),
+                       (const GLuint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                       4));
 }
 
 void
-__glXDispSwap_VertexAttrib4uivARB(GLbyte * pc)
+__glXDispSwap_VertexAttrib4usv(GLbyte * pc)
 {
-    CALL_VertexAttrib4uivARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              (const GLuint *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    glVertexAttrib4usv((GLuint) bswap_CARD32(pc + 0),
+                       (const GLushort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                         4));
 }
 
 void
-__glXDispSwap_VertexAttrib4usvARB(GLbyte * pc)
+__glXDispSwap_ClampColor(GLbyte * pc)
 {
-    CALL_VertexAttrib4usvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              (const GLushort *)
-                                              bswap_16_array((uint16_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    glClampColor((GLenum) bswap_ENUM(pc + 0), (GLenum) bswap_ENUM(pc + 4));
 }
 
 void
-__glXDispSwap_BeginQueryARB(GLbyte * pc)
+__glXDispSwap_BindProgramARB(GLbyte * pc)
 {
-    CALL_BeginQueryARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLuint) bswap_CARD32(pc + 4)
-                       ));
+    glBindProgramARB((GLenum) bswap_ENUM(pc + 0),
+                     (GLuint) bswap_CARD32(pc + 4));
 }
 
 int
-__glXDispSwap_DeleteQueriesARB(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_DeleteProgramsARB(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext *const cx =
         __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
+    pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
         const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
 
-        CALL_DeleteQueriesARB(GET_DISPATCH(), (n,
-                                               (const GLuint *)
-                                               bswap_32_array((uint32_t *) (pc +
-                                                                            4),
-                                                              0)
-                              ));
+        glDeleteProgramsARB(n,
+                            (const GLuint *)
+                            bswap_32_array((uint32_t *) (pc + 4), 0));
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDispSwap_EndQueryARB(GLbyte * pc)
-{
-    CALL_EndQueryARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                     ));
-}
-
 int
-__glXDispSwap_GenQueriesARB(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_GenProgramsARB(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext *const cx =
         __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
+    pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
         const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
 
         GLuint answerBuffer[200];
-        GLuint *ids =
+        GLuint *programs =
             __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                  4);
-        CALL_GenQueriesARB(GET_DISPATCH(), (n, ids));
-        (void) bswap_32_array((uint32_t *) ids, n);
-        __glXSendReplySwap(cl->client, ids, n, 4, GL_TRUE, 0);
+        glGenProgramsARB(n, programs);
+        (void) bswap_32_array((uint32_t *) programs, n);
+        __glXSendReplySwap(cl->client, programs, n, 4, GL_TRUE, 0);
         error = Success;
     }
 
@@ -5269,31 +4615,43 @@ __glXDispSwap_GenQueriesARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetQueryObjectivARB(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_GetProgramEnvParameterdvARB(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext *const cx =
         __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
+    pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+        GLdouble params[4];
 
-        const GLuint compsize = __glGetQueryObjectivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        glGetProgramEnvParameterdvARB((GLenum) bswap_ENUM(pc + 0),
+                                      (GLuint) bswap_CARD32(pc + 4), params);
+        (void) bswap_64_array((uint64_t *) params, 4);
+        __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
+        error = Success;
+    }
 
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+    return error;
+}
 
-        CALL_GetQueryObjectivARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                                  pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+int
+__glXDispSwap_GetProgramEnvParameterfvARB(__GLXclientState * cl, GLbyte * pc)
+{
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext *const cx =
+        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if (cx != NULL) {
+        GLfloat params[4];
+
+        glGetProgramEnvParameterfvARB((GLenum) bswap_ENUM(pc + 0),
+                                      (GLuint) bswap_CARD32(pc + 4), params);
+        (void) bswap_32_array((uint32_t *) params, 4);
+        __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
         error = Success;
     }
 
@@ -5301,32 +4659,43 @@ __glXDispSwap_GetQueryObjectivARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetQueryObjectuivARB(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_GetProgramLocalParameterdvARB(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext *const cx =
         __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
+    pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+        GLdouble params[4];
 
-        const GLuint compsize = __glGetQueryObjectuivARB_size(pname);
-        GLuint answerBuffer[200];
-        GLuint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        glGetProgramLocalParameterdvARB((GLenum) bswap_ENUM(pc + 0),
+                                        (GLuint) bswap_CARD32(pc + 4), params);
+        (void) bswap_64_array((uint64_t *) params, 4);
+        __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
+        error = Success;
+    }
 
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+    return error;
+}
 
-        CALL_GetQueryObjectuivARB(GET_DISPATCH(), ((GLuint)
-                                                   bswap_CARD32(pc + 0), pname,
-                                                   params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+int
+__glXDispSwap_GetProgramLocalParameterfvARB(__GLXclientState * cl, GLbyte * pc)
+{
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext *const cx =
+        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if (cx != NULL) {
+        GLfloat params[4];
+
+        glGetProgramLocalParameterfvARB((GLenum) bswap_ENUM(pc + 0),
+                                        (GLuint) bswap_CARD32(pc + 4), params);
+        (void) bswap_32_array((uint32_t *) params, 4);
+        __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
         error = Success;
     }
 
@@ -5334,18 +4703,18 @@ __glXDispSwap_GetQueryObjectuivARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetQueryivARB(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_GetProgramivARB(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext *const cx =
         __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
+    pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
         const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
 
-        const GLuint compsize = __glGetQueryivARB_size(pname);
+        const GLuint compsize = __glGetProgramivARB_size(pname);
         GLint answerBuffer[200];
         GLint *params =
             __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
@@ -5355,8 +4724,7 @@ __glXDispSwap_GetQueryivARB(__GLXclientState * cl, GLbyte * pc)
             return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetQueryivARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            pname, params));
+        glGetProgramivARB((GLenum) bswap_ENUM(pc + 0), pname, params);
         (void) bswap_32_array((uint32_t *) params, compsize);
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
@@ -5366,19 +4734,18 @@ __glXDispSwap_GetQueryivARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_IsQueryARB(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_IsProgramARB(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
     __GLXcontext *const cx =
         __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
+    pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
         GLboolean retval;
 
-        retval = CALL_IsQueryARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                                 ));
+        retval = glIsProgramARB((GLuint) bswap_CARD32(pc + 0));
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -5387,205 +4754,128 @@ __glXDispSwap_IsQueryARB(__GLXclientState * cl, GLbyte * pc)
 }
 
 void
-__glXDispSwap_DrawBuffersARB(GLbyte * pc)
-{
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-    CALL_DrawBuffersARB(GET_DISPATCH(), (n,
-                                         (const GLenum *)
-                                         bswap_32_array((uint32_t *) (pc + 4),
-                                                        0)
-                        ));
-}
-
-void
-__glXDispSwap_ClampColorARB(GLbyte * pc)
-{
-    CALL_ClampColorARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLenum) bswap_ENUM(pc + 4)
-                       ));
-}
-
-void
-__glXDispSwap_RenderbufferStorageMultisample(GLbyte * pc)
-{
-    CALL_RenderbufferStorageMultisample(GET_DISPATCH(), ((GLenum)
-                                                         bswap_ENUM(pc + 0),
-                                                         (GLsizei)
-                                                         bswap_CARD32(pc + 4),
-                                                         (GLenum) bswap_ENUM(pc
-                                                                             +
-                                                                             8),
-                                                         (GLsizei)
-                                                         bswap_CARD32(pc + 12),
-                                                         (GLsizei)
-                                                         bswap_CARD32(pc + 16)
-                                        ));
-}
-
-void
-__glXDispSwap_SampleMaskSGIS(GLbyte * pc)
-{
-    CALL_SampleMaskSGIS(GET_DISPATCH(), ((GLclampf) bswap_FLOAT32(pc + 0),
-                                         *(GLboolean *) (pc + 4)
-                        ));
-}
-
-void
-__glXDispSwap_SamplePatternSGIS(GLbyte * pc)
-{
-    CALL_SamplePatternSGIS(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                           ));
-}
-
-void
-__glXDispSwap_PointParameterfEXT(GLbyte * pc)
-{
-    CALL_PointParameterfEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                             (GLfloat) bswap_FLOAT32(pc + 4)
-                            ));
-}
-
-void
-__glXDispSwap_PointParameterfvEXT(GLbyte * pc)
+__glXDispSwap_ProgramEnvParameter4dvARB(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
-    const GLfloat *params;
-
-    params =
-        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
-                                         __glPointParameterfvEXT_size(pname));
+#ifdef __GLX_ALIGN64
+    if ((unsigned long) (pc) & 7) {
+        (void) memmove(pc - 4, pc, 40);
+        pc -= 4;
+    }
+#endif
 
-    CALL_PointParameterfvEXT(GET_DISPATCH(), (pname, params));
+    glProgramEnvParameter4dvARB((GLenum) bswap_ENUM(pc + 0),
+                                (GLuint) bswap_CARD32(pc + 4),
+                                (const GLdouble *)
+                                bswap_64_array((uint64_t *) (pc + 8), 4));
 }
 
 void
-__glXDispSwap_SecondaryColor3bvEXT(GLbyte * pc)
+__glXDispSwap_ProgramEnvParameter4fvARB(GLbyte * pc)
 {
-    CALL_SecondaryColor3bvEXT(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                              ));
+    glProgramEnvParameter4fvARB((GLenum) bswap_ENUM(pc + 0),
+                                (GLuint) bswap_CARD32(pc + 4),
+                                (const GLfloat *)
+                                bswap_32_array((uint32_t *) (pc + 8), 4));
 }
 
 void
-__glXDispSwap_SecondaryColor3dvEXT(GLbyte * pc)
+__glXDispSwap_ProgramLocalParameter4dvARB(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
     if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+        (void) memmove(pc - 4, pc, 40);
         pc -= 4;
     }
 #endif
 
-    CALL_SecondaryColor3dvEXT(GET_DISPATCH(), ((const GLdouble *)
-                                               bswap_64_array((uint64_t *) (pc +
-                                                                            0),
-                                                              3)
-                              ));
+    glProgramLocalParameter4dvARB((GLenum) bswap_ENUM(pc + 0),
+                                  (GLuint) bswap_CARD32(pc + 4),
+                                  (const GLdouble *)
+                                  bswap_64_array((uint64_t *) (pc + 8), 4));
 }
 
 void
-__glXDispSwap_SecondaryColor3fvEXT(GLbyte * pc)
+__glXDispSwap_ProgramLocalParameter4fvARB(GLbyte * pc)
 {
-    CALL_SecondaryColor3fvEXT(GET_DISPATCH(), ((const GLfloat *)
-                                               bswap_32_array((uint32_t *) (pc +
-                                                                            0),
-                                                              3)
-                              ));
+    glProgramLocalParameter4fvARB((GLenum) bswap_ENUM(pc + 0),
+                                  (GLuint) bswap_CARD32(pc + 4),
+                                  (const GLfloat *)
+                                  bswap_32_array((uint32_t *) (pc + 8), 4));
 }
 
 void
-__glXDispSwap_SecondaryColor3ivEXT(GLbyte * pc)
+__glXDispSwap_ProgramStringARB(GLbyte * pc)
 {
-    CALL_SecondaryColor3ivEXT(GET_DISPATCH(), ((const GLint *)
-                                               bswap_32_array((uint32_t *) (pc +
-                                                                            0),
-                                                              3)
-                              ));
-}
+    const GLsizei len = (GLsizei) bswap_CARD32(pc + 8);
 
-void
-__glXDispSwap_SecondaryColor3svEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3svEXT(GET_DISPATCH(), ((const GLshort *)
-                                               bswap_16_array((uint16_t *) (pc +
-                                                                            0),
-                                                              3)
-                              ));
+    glProgramStringARB((GLenum) bswap_ENUM(pc + 0),
+                       (GLenum) bswap_ENUM(pc + 4),
+                       len, (const GLvoid *) (pc + 12));
 }
 
 void
-__glXDispSwap_SecondaryColor3ubvEXT(GLbyte * pc)
+__glXDispSwap_VertexAttrib1fvARB(GLbyte * pc)
 {
-    CALL_SecondaryColor3ubvEXT(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                               ));
+    glVertexAttrib1fvARB((GLuint) bswap_CARD32(pc + 0),
+                         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
+                                                          1));
 }
 
 void
-__glXDispSwap_SecondaryColor3uivEXT(GLbyte * pc)
+__glXDispSwap_VertexAttrib2fvARB(GLbyte * pc)
 {
-    CALL_SecondaryColor3uivEXT(GET_DISPATCH(), ((const GLuint *)
-                                                bswap_32_array((uint32_t *) (pc
-                                                                             +
-                                                                             0),
-                                                               3)
-                               ));
+    glVertexAttrib2fvARB((GLuint) bswap_CARD32(pc + 0),
+                         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
+                                                          2));
 }
 
 void
-__glXDispSwap_SecondaryColor3usvEXT(GLbyte * pc)
+__glXDispSwap_VertexAttrib3fvARB(GLbyte * pc)
 {
-    CALL_SecondaryColor3usvEXT(GET_DISPATCH(), ((const GLushort *)
-                                                bswap_16_array((uint16_t *) (pc
-                                                                             +
-                                                                             0),
-                                                               3)
-                               ));
+    glVertexAttrib3fvARB((GLuint) bswap_CARD32(pc + 0),
+                         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
+                                                          3));
 }
 
 void
-__glXDispSwap_FogCoorddvEXT(GLbyte * pc)
+__glXDispSwap_VertexAttrib4fvARB(GLbyte * pc)
 {
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 8);
-        pc -= 4;
-    }
-#endif
-
-    CALL_FogCoorddvEXT(GET_DISPATCH(), ((const GLdouble *)
-                                        bswap_64_array((uint64_t *) (pc + 0), 1)
-                       ));
+    glVertexAttrib4fvARB((GLuint) bswap_CARD32(pc + 0),
+                         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
+                                                          4));
 }
 
 void
-__glXDispSwap_FogCoordfvEXT(GLbyte * pc)
+__glXDispSwap_BindFramebuffer(GLbyte * pc)
 {
-    CALL_FogCoordfvEXT(GET_DISPATCH(), ((const GLfloat *)
-                                        bswap_32_array((uint32_t *) (pc + 0), 1)
-                       ));
+    glBindFramebuffer((GLenum) bswap_ENUM(pc + 0),
+                      (GLuint) bswap_CARD32(pc + 4));
 }
 
 void
-__glXDispSwap_BlendFuncSeparateEXT(GLbyte * pc)
+__glXDispSwap_BindRenderbuffer(GLbyte * pc)
 {
-    CALL_BlendFuncSeparateEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                               (GLenum) bswap_ENUM(pc + 4),
-                                               (GLenum) bswap_ENUM(pc + 8),
-                                               (GLenum) bswap_ENUM(pc + 12)
-                              ));
+    glBindRenderbuffer((GLenum) bswap_ENUM(pc + 0),
+                       (GLuint) bswap_CARD32(pc + 4));
 }
 
 void
-__glXDispSwap_WindowPos3fvMESA(GLbyte * pc)
+__glXDispSwap_BlitFramebuffer(GLbyte * pc)
 {
-    CALL_WindowPos3fvMESA(GET_DISPATCH(), ((const GLfloat *)
-                                           bswap_32_array((uint32_t *) (pc + 0),
-                                                          3)
-                          ));
+    glBlitFramebuffer((GLint) bswap_CARD32(pc + 0),
+                      (GLint) bswap_CARD32(pc + 4),
+                      (GLint) bswap_CARD32(pc + 8),
+                      (GLint) bswap_CARD32(pc + 12),
+                      (GLint) bswap_CARD32(pc + 16),
+                      (GLint) bswap_CARD32(pc + 20),
+                      (GLint) bswap_CARD32(pc + 24),
+                      (GLint) bswap_CARD32(pc + 28),
+                      (GLbitfield) bswap_CARD32(pc + 32),
+                      (GLenum) bswap_ENUM(pc + 36));
 }
 
 int
-__glXDispSwap_AreProgramsResidentNV(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_CheckFramebufferStatus(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -5594,19 +4884,10 @@ __glXDispSwap_AreProgramsResidentNV(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
+        GLenum retval;
 
-        GLboolean retval;
-        GLboolean answerBuffer[200];
-        GLboolean *residences =
-            __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval =
-            CALL_AreProgramsResidentNV(GET_DISPATCH(),
-                                       (n,
-                                        (const GLuint *)
-                                        bswap_32_array((uint32_t *) (pc + 4),
-                                                       0), residences));
-        __glXSendReplySwap(cl->client, residences, n, 1, GL_FALSE, retval);
+        retval = glCheckFramebufferStatus((GLenum) bswap_ENUM(pc + 0));
+        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
 
@@ -5614,75 +4895,77 @@ __glXDispSwap_AreProgramsResidentNV(__GLXclientState * cl, GLbyte * pc)
 }
 
 void
-__glXDispSwap_BindProgramNV(GLbyte * pc)
+__glXDispSwap_DeleteFramebuffers(GLbyte * pc)
 {
-    CALL_BindProgramNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLuint) bswap_CARD32(pc + 4)
-                       ));
+    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
+
+    glDeleteFramebuffers(n,
+                         (const GLuint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                         0));
 }
 
-int
-__glXDispSwap_DeleteProgramsNV(__GLXclientState * cl, GLbyte * pc)
+void
+__glXDispSwap_DeleteRenderbuffers(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-        CALL_DeleteProgramsNV(GET_DISPATCH(), (n,
-                                               (const GLuint *)
-                                               bswap_32_array((uint32_t *) (pc +
-                                                                            4),
-                                                              0)
-                              ));
-        error = Success;
-    }
+    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
 
-    return error;
+    glDeleteRenderbuffers(n,
+                          (const GLuint *) bswap_32_array((uint32_t *) (pc + 4),
+                                                          0));
 }
 
 void
-__glXDispSwap_ExecuteProgramNV(GLbyte * pc)
+__glXDispSwap_FramebufferRenderbuffer(GLbyte * pc)
 {
-    CALL_ExecuteProgramNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                           (GLuint) bswap_CARD32(pc + 4),
-                                           (const GLfloat *)
-                                           bswap_32_array((uint32_t *) (pc + 8),
-                                                          4)
-                          ));
+    glFramebufferRenderbuffer((GLenum) bswap_ENUM(pc + 0),
+                              (GLenum) bswap_ENUM(pc + 4),
+                              (GLenum) bswap_ENUM(pc + 8),
+                              (GLuint) bswap_CARD32(pc + 12));
 }
 
-int
-__glXDispSwap_GenProgramsNV(__GLXclientState * cl, GLbyte * pc)
+void
+__glXDispSwap_FramebufferTexture1D(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    glFramebufferTexture1D((GLenum) bswap_ENUM(pc + 0),
+                           (GLenum) bswap_ENUM(pc + 4),
+                           (GLenum) bswap_ENUM(pc + 8),
+                           (GLuint) bswap_CARD32(pc + 12),
+                           (GLint) bswap_CARD32(pc + 16));
+}
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
+void
+__glXDispSwap_FramebufferTexture2D(GLbyte * pc)
+{
+    glFramebufferTexture2D((GLenum) bswap_ENUM(pc + 0),
+                           (GLenum) bswap_ENUM(pc + 4),
+                           (GLenum) bswap_ENUM(pc + 8),
+                           (GLuint) bswap_CARD32(pc + 12),
+                           (GLint) bswap_CARD32(pc + 16));
+}
 
-        GLuint answerBuffer[200];
-        GLuint *programs =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenProgramsNV(GET_DISPATCH(), (n, programs));
-        (void) bswap_32_array((uint32_t *) programs, n);
-        __glXSendReplySwap(cl->client, programs, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
+void
+__glXDispSwap_FramebufferTexture3D(GLbyte * pc)
+{
+    glFramebufferTexture3D((GLenum) bswap_ENUM(pc + 0),
+                           (GLenum) bswap_ENUM(pc + 4),
+                           (GLenum) bswap_ENUM(pc + 8),
+                           (GLuint) bswap_CARD32(pc + 12),
+                           (GLint) bswap_CARD32(pc + 16),
+                           (GLint) bswap_CARD32(pc + 20));
+}
 
-    return error;
+void
+__glXDispSwap_FramebufferTextureLayer(GLbyte * pc)
+{
+    glFramebufferTextureLayer((GLenum) bswap_ENUM(pc + 0),
+                              (GLenum) bswap_ENUM(pc + 4),
+                              (GLuint) bswap_CARD32(pc + 8),
+                              (GLint) bswap_CARD32(pc + 12),
+                              (GLint) bswap_CARD32(pc + 16));
 }
 
 int
-__glXDispSwap_GetProgramParameterdvNV(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_GenFramebuffers(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -5691,17 +4974,15 @@ __glXDispSwap_GetProgramParameterdvNV(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        GLdouble params[4];
+        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
 
-        CALL_GetProgramParameterdvNV(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0),
-                                                      (GLuint) bswap_CARD32(pc +
-                                                                            4),
-                                                      (GLenum) bswap_ENUM(pc +
-                                                                          8),
-                                                      params));
-        (void) bswap_64_array((uint64_t *) params, 4);
-        __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
+        GLuint answerBuffer[200];
+        GLuint *framebuffers =
+            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
+                                 4);
+        glGenFramebuffers(n, framebuffers);
+        (void) bswap_32_array((uint32_t *) framebuffers, n);
+        __glXSendReplySwap(cl->client, framebuffers, n, 4, GL_TRUE, 0);
         error = Success;
     }
 
@@ -5709,7 +4990,7 @@ __glXDispSwap_GetProgramParameterdvNV(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetProgramParameterfvNV(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_GenRenderbuffers(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -5718,57 +4999,30 @@ __glXDispSwap_GetProgramParameterfvNV(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        GLfloat params[4];
+        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
 
-        CALL_GetProgramParameterfvNV(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0),
-                                                      (GLuint) bswap_CARD32(pc +
-                                                                            4),
-                                                      (GLenum) bswap_ENUM(pc +
-                                                                          8),
-                                                      params));
-        (void) bswap_32_array((uint32_t *) params, 4);
-        __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
+        GLuint answerBuffer[200];
+        GLuint *renderbuffers =
+            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
+                                 4);
+        glGenRenderbuffers(n, renderbuffers);
+        (void) bswap_32_array((uint32_t *) renderbuffers, n);
+        __glXSendReplySwap(cl->client, renderbuffers, n, 4, GL_TRUE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_GetProgramivNV(__GLXclientState * cl, GLbyte * pc)
+void
+__glXDispSwap_GenerateMipmap(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-
-        const GLuint compsize = __glGetProgramivNV_size(pname);
-        GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
-
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetProgramivNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
+    glGenerateMipmap((GLenum) bswap_ENUM(pc + 0));
 }
 
 int
-__glXDispSwap_GetTrackMatrixivNV(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_GetFramebufferAttachmentParameteriv(__GLXclientState * cl,
+                                                  GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -5779,10 +5033,10 @@ __glXDispSwap_GetTrackMatrixivNV(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLint params[1];
 
-        CALL_GetTrackMatrixivNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                 (GLuint) bswap_CARD32(pc + 4),
-                                                 (GLenum) bswap_ENUM(pc + 8),
-                                                 params));
+        glGetFramebufferAttachmentParameteriv((GLenum) bswap_ENUM(pc + 0),
+                                              (GLenum) bswap_ENUM(pc + 4),
+                                              (GLenum) bswap_ENUM(pc + 8),
+                                              params);
         (void) bswap_32_array((uint32_t *) params, 1);
         __glXSendReplySwap(cl->client, params, 1, 4, GL_FALSE, 0);
         error = Success;
@@ -5792,39 +5046,7 @@ __glXDispSwap_GetTrackMatrixivNV(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetVertexAttribdvNV(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-
-        const GLuint compsize = __glGetVertexAttribdvNV_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble *params =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
-
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribdvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                                  pname, params));
-        (void) bswap_64_array((uint64_t *) params, compsize);
-        __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDispSwap_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_GetRenderbufferParameteriv(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -5833,22 +5055,12 @@ __glXDispSwap_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-
-        const GLuint compsize = __glGetVertexAttribfvNV_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
-
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+        GLint params[1];
 
-        CALL_GetVertexAttribfvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                                  pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        glGetRenderbufferParameteriv((GLenum) bswap_ENUM(pc + 0),
+                                     (GLenum) bswap_ENUM(pc + 4), params);
+        (void) bswap_32_array((uint32_t *) params, 1);
+        __glXSendReplySwap(cl->client, params, 1, 4, GL_FALSE, 0);
         error = Success;
     }
 
@@ -5856,7 +5068,7 @@ __glXDispSwap_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_IsFramebuffer(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -5865,22 +5077,10 @@ __glXDispSwap_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
     if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-
-        const GLuint compsize = __glGetVertexAttribivNV_size(pname);
-        GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
-
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+        GLboolean retval;
 
-        CALL_GetVertexAttribivNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                                  pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        retval = glIsFramebuffer((GLuint) bswap_CARD32(pc + 0));
+        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
 
@@ -5888,7 +5088,7 @@ __glXDispSwap_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_IsProgramNV(__GLXclientState * cl, GLbyte * pc)
+__glXDispSwap_IsRenderbuffer(__GLXclientState * cl, GLbyte * pc)
 {
     xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
     int error;
@@ -5899,8 +5099,7 @@ __glXDispSwap_IsProgramNV(__GLXclientState * cl, GLbyte * pc)
     if (cx != NULL) {
         GLboolean retval;
 
-        retval = CALL_IsProgramNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                                  ));
+        retval = glIsRenderbuffer((GLuint) bswap_CARD32(pc + 0));
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -5909,78 +5108,35 @@ __glXDispSwap_IsProgramNV(__GLXclientState * cl, GLbyte * pc)
 }
 
 void
-__glXDispSwap_LoadProgramNV(GLbyte * pc)
+__glXDispSwap_RenderbufferStorage(GLbyte * pc)
 {
-    const GLsizei len = (GLsizei) bswap_CARD32(pc + 8);
-
-    CALL_LoadProgramNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLuint) bswap_CARD32(pc + 4),
-                                        len, (const GLubyte *) (pc + 12)
-                       ));
-}
-
-void
-__glXDispSwap_ProgramParameters4dvNV(GLbyte * pc)
-{
-    const GLsizei num = (GLsizei) bswap_CARD32(pc + 8);
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramParameters4dvNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                 (GLuint) bswap_CARD32(pc + 4),
-                                                 num,
-                                                 (const GLdouble *)
-                                                 bswap_64_array((uint64_t *) (pc
-                                                                              +
-                                                                              12),
-                                                                0)
-                                ));
+    glRenderbufferStorage((GLenum) bswap_ENUM(pc + 0),
+                          (GLenum) bswap_ENUM(pc + 4),
+                          (GLsizei) bswap_CARD32(pc + 8),
+                          (GLsizei) bswap_CARD32(pc + 12));
 }
 
 void
-__glXDispSwap_ProgramParameters4fvNV(GLbyte * pc)
+__glXDispSwap_RenderbufferStorageMultisample(GLbyte * pc)
 {
-    const GLsizei num = (GLsizei) bswap_CARD32(pc + 8);
-
-    CALL_ProgramParameters4fvNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                 (GLuint) bswap_CARD32(pc + 4),
-                                                 num,
-                                                 (const GLfloat *)
-                                                 bswap_32_array((uint32_t *) (pc
-                                                                              +
-                                                                              12),
-                                                                0)
-                                ));
+    glRenderbufferStorageMultisample((GLenum) bswap_ENUM(pc + 0),
+                                     (GLsizei) bswap_CARD32(pc + 4),
+                                     (GLenum) bswap_ENUM(pc + 8),
+                                     (GLsizei) bswap_CARD32(pc + 12),
+                                     (GLsizei) bswap_CARD32(pc + 16));
 }
 
 void
-__glXDispSwap_RequestResidentProgramsNV(GLbyte * pc)
+__glXDispSwap_SecondaryColor3fvEXT(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-    CALL_RequestResidentProgramsNV(GET_DISPATCH(), (n,
-                                                    (const GLuint *)
-                                                    bswap_32_array((uint32_t
-                                                                    *) (pc + 4),
-                                                                   0)
-                                   ));
+    glSecondaryColor3fvEXT((const GLfloat *)
+                           bswap_32_array((uint32_t *) (pc + 0), 3));
 }
 
 void
-__glXDispSwap_TrackMatrixNV(GLbyte * pc)
+__glXDispSwap_FogCoordfvEXT(GLbyte * pc)
 {
-    CALL_TrackMatrixNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLuint) bswap_CARD32(pc + 4),
-                                        (GLenum) bswap_ENUM(pc + 8),
-                                        (GLenum) bswap_ENUM(pc + 12)
-                       ));
+    glFogCoordfvEXT((const GLfloat *) bswap_32_array((uint32_t *) (pc + 0), 1));
 }
 
 void
@@ -5993,31 +5149,25 @@ __glXDispSwap_VertexAttrib1dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib1dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLdouble *)
-                                            bswap_64_array((uint64_t *) (pc +
-                                                                         4), 1)
-                           ));
+    glVertexAttrib1dvNV((GLuint) bswap_CARD32(pc + 0),
+                        (const GLdouble *) bswap_64_array((uint64_t *) (pc + 4),
+                                                          1));
 }
 
 void
 __glXDispSwap_VertexAttrib1fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib1fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLfloat *)
-                                            bswap_32_array((uint32_t *) (pc +
-                                                                         4), 1)
-                           ));
+    glVertexAttrib1fvNV((GLuint) bswap_CARD32(pc + 0),
+                        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
+                                                         1));
 }
 
 void
 __glXDispSwap_VertexAttrib1svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib1svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLshort *)
-                                            bswap_16_array((uint16_t *) (pc +
-                                                                         4), 1)
-                           ));
+    glVertexAttrib1svNV((GLuint) bswap_CARD32(pc + 0),
+                        (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                         1));
 }
 
 void
@@ -6030,31 +5180,25 @@ __glXDispSwap_VertexAttrib2dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib2dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLdouble *)
-                                            bswap_64_array((uint64_t *) (pc +
-                                                                         4), 2)
-                           ));
+    glVertexAttrib2dvNV((GLuint) bswap_CARD32(pc + 0),
+                        (const GLdouble *) bswap_64_array((uint64_t *) (pc + 4),
+                                                          2));
 }
 
 void
 __glXDispSwap_VertexAttrib2fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib2fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLfloat *)
-                                            bswap_32_array((uint32_t *) (pc +
-                                                                         4), 2)
-                           ));
+    glVertexAttrib2fvNV((GLuint) bswap_CARD32(pc + 0),
+                        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
+                                                         2));
 }
 
 void
 __glXDispSwap_VertexAttrib2svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib2svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLshort *)
-                                            bswap_16_array((uint16_t *) (pc +
-                                                                         4), 2)
-                           ));
+    glVertexAttrib2svNV((GLuint) bswap_CARD32(pc + 0),
+                        (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                         2));
 }
 
 void
@@ -6067,31 +5211,25 @@ __glXDispSwap_VertexAttrib3dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib3dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLdouble *)
-                                            bswap_64_array((uint64_t *) (pc +
-                                                                         4), 3)
-                           ));
+    glVertexAttrib3dvNV((GLuint) bswap_CARD32(pc + 0),
+                        (const GLdouble *) bswap_64_array((uint64_t *) (pc + 4),
+                                                          3));
 }
 
 void
 __glXDispSwap_VertexAttrib3fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib3fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLfloat *)
-                                            bswap_32_array((uint32_t *) (pc +
-                                                                         4), 3)
-                           ));
+    glVertexAttrib3fvNV((GLuint) bswap_CARD32(pc + 0),
+                        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
+                                                         3));
 }
 
 void
 __glXDispSwap_VertexAttrib3svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib3svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLshort *)
-                                            bswap_16_array((uint16_t *) (pc +
-                                                                         4), 3)
-                           ));
+    glVertexAttrib3svNV((GLuint) bswap_CARD32(pc + 0),
+                        (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                         3));
 }
 
 void
@@ -6104,39 +5242,32 @@ __glXDispSwap_VertexAttrib4dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttrib4dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLdouble *)
-                                            bswap_64_array((uint64_t *) (pc +
-                                                                         4), 4)
-                           ));
+    glVertexAttrib4dvNV((GLuint) bswap_CARD32(pc + 0),
+                        (const GLdouble *) bswap_64_array((uint64_t *) (pc + 4),
+                                                          4));
 }
 
 void
 __glXDispSwap_VertexAttrib4fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib4fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLfloat *)
-                                            bswap_32_array((uint32_t *) (pc +
-                                                                         4), 4)
-                           ));
+    glVertexAttrib4fvNV((GLuint) bswap_CARD32(pc + 0),
+                        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
+                                                         4));
 }
 
 void
 __glXDispSwap_VertexAttrib4svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib4svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLshort *)
-                                            bswap_16_array((uint16_t *) (pc +
-                                                                         4), 4)
-                           ));
+    glVertexAttrib4svNV((GLuint) bswap_CARD32(pc + 0),
+                        (const GLshort *) bswap_16_array((uint16_t *) (pc + 4),
+                                                         4));
 }
 
 void
 __glXDispSwap_VertexAttrib4ubvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib4ubvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLubyte *) (pc + 4)
-                            ));
+    glVertexAttrib4ubvNV((GLuint) bswap_CARD32(pc + 0),
+                         (const GLubyte *) (pc + 4));
 }
 
 void
@@ -6153,12 +5284,10 @@ __glXDispSwap_VertexAttribs1dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttribs1dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          8), 0)
-                            ));
+    glVertexAttribs1dvNV((GLuint) bswap_CARD32(pc + 0),
+                         n,
+                         (const GLdouble *)
+                         bswap_64_array((uint64_t *) (pc + 8), 0));
 }
 
 void
@@ -6166,12 +5295,10 @@ __glXDispSwap_VertexAttribs1fvNV(GLbyte * pc)
 {
     const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
 
-    CALL_VertexAttribs1fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          8), 0)
-                            ));
+    glVertexAttribs1fvNV((GLuint) bswap_CARD32(pc + 0),
+                         n,
+                         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
+                                                          0));
 }
 
 void
@@ -6179,12 +5306,10 @@ __glXDispSwap_VertexAttribs1svNV(GLbyte * pc)
 {
     const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
 
-    CALL_VertexAttribs1svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          8), 0)
-                            ));
+    glVertexAttribs1svNV((GLuint) bswap_CARD32(pc + 0),
+                         n,
+                         (const GLshort *) bswap_16_array((uint16_t *) (pc + 8),
+                                                          0));
 }
 
 void
@@ -6201,12 +5326,10 @@ __glXDispSwap_VertexAttribs2dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttribs2dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          8), 0)
-                            ));
+    glVertexAttribs2dvNV((GLuint) bswap_CARD32(pc + 0),
+                         n,
+                         (const GLdouble *)
+                         bswap_64_array((uint64_t *) (pc + 8), 0));
 }
 
 void
@@ -6214,12 +5337,10 @@ __glXDispSwap_VertexAttribs2fvNV(GLbyte * pc)
 {
     const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
 
-    CALL_VertexAttribs2fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          8), 0)
-                            ));
+    glVertexAttribs2fvNV((GLuint) bswap_CARD32(pc + 0),
+                         n,
+                         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
+                                                          0));
 }
 
 void
@@ -6227,12 +5348,10 @@ __glXDispSwap_VertexAttribs2svNV(GLbyte * pc)
 {
     const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
 
-    CALL_VertexAttribs2svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          8), 0)
-                            ));
+    glVertexAttribs2svNV((GLuint) bswap_CARD32(pc + 0),
+                         n,
+                         (const GLshort *) bswap_16_array((uint16_t *) (pc + 8),
+                                                          0));
 }
 
 void
@@ -6249,12 +5368,10 @@ __glXDispSwap_VertexAttribs3dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttribs3dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          8), 0)
-                            ));
+    glVertexAttribs3dvNV((GLuint) bswap_CARD32(pc + 0),
+                         n,
+                         (const GLdouble *)
+                         bswap_64_array((uint64_t *) (pc + 8), 0));
 }
 
 void
@@ -6262,12 +5379,10 @@ __glXDispSwap_VertexAttribs3fvNV(GLbyte * pc)
 {
     const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
 
-    CALL_VertexAttribs3fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          8), 0)
-                            ));
+    glVertexAttribs3fvNV((GLuint) bswap_CARD32(pc + 0),
+                         n,
+                         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
+                                                          0));
 }
 
 void
@@ -6275,12 +5390,10 @@ __glXDispSwap_VertexAttribs3svNV(GLbyte * pc)
 {
     const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
 
-    CALL_VertexAttribs3svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          8), 0)
-                            ));
+    glVertexAttribs3svNV((GLuint) bswap_CARD32(pc + 0),
+                         n,
+                         (const GLshort *) bswap_16_array((uint16_t *) (pc + 8),
+                                                          0));
 }
 
 void
@@ -6297,12 +5410,10 @@ __glXDispSwap_VertexAttribs4dvNV(GLbyte * pc)
     }
 #endif
 
-    CALL_VertexAttribs4dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          8), 0)
-                            ));
+    glVertexAttribs4dvNV((GLuint) bswap_CARD32(pc + 0),
+                         n,
+                         (const GLdouble *)
+                         bswap_64_array((uint64_t *) (pc + 8), 0));
 }
 
 void
@@ -6310,12 +5421,10 @@ __glXDispSwap_VertexAttribs4fvNV(GLbyte * pc)
 {
     const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
 
-    CALL_VertexAttribs4fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          8), 0)
-                            ));
+    glVertexAttribs4fvNV((GLuint) bswap_CARD32(pc + 0),
+                         n,
+                         (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
+                                                          0));
 }
 
 void
@@ -6323,12 +5432,10 @@ __glXDispSwap_VertexAttribs4svNV(GLbyte * pc)
 {
     const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
 
-    CALL_VertexAttribs4svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          8), 0)
-                            ));
+    glVertexAttribs4svNV((GLuint) bswap_CARD32(pc + 0),
+                         n,
+                         (const GLshort *) bswap_16_array((uint16_t *) (pc + 8),
+                                                          0));
 }
 
 void
@@ -6336,459 +5443,12 @@ __glXDispSwap_VertexAttribs4ubvNV(GLbyte * pc)
 {
     const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
 
-    CALL_VertexAttribs4ubvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              n, (const GLubyte *) (pc + 8)
-                             ));
-}
-
-void
-__glXDispSwap_PointParameteriNV(GLbyte * pc)
-{
-    CALL_PointParameteriNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            (GLint) bswap_CARD32(pc + 4)
-                           ));
-}
-
-void
-__glXDispSwap_PointParameterivNV(GLbyte * pc)
-{
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
-    const GLint *params;
-
-    params =
-        (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
-                                       __glPointParameterivNV_size(pname));
-
-    CALL_PointParameterivNV(GET_DISPATCH(), (pname, params));
+    glVertexAttribs4ubvNV((GLuint) bswap_CARD32(pc + 0),
+                          n, (const GLubyte *) (pc + 8));
 }
 
 void
 __glXDispSwap_ActiveStencilFaceEXT(GLbyte * pc)
 {
-    CALL_ActiveStencilFaceEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                              ));
-}
-
-int
-__glXDispSwap_GetProgramNamedParameterdvNV(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei len = (GLsizei) bswap_CARD32(pc + 4);
-
-        GLdouble params[4];
-
-        CALL_GetProgramNamedParameterdvNV(GET_DISPATCH(), ((GLuint)
-                                                           bswap_CARD32(pc + 0),
-                                                           len,
-                                                           (const GLubyte *) (pc
-                                                                              +
-                                                                              8),
-                                                           params));
-        (void) bswap_64_array((uint64_t *) params, 4);
-        __glXSendReplySwap(cl->client, params, 4, 8, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDispSwap_GetProgramNamedParameterfvNV(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei len = (GLsizei) bswap_CARD32(pc + 4);
-
-        GLfloat params[4];
-
-        CALL_GetProgramNamedParameterfvNV(GET_DISPATCH(), ((GLuint)
-                                                           bswap_CARD32(pc + 0),
-                                                           len,
-                                                           (const GLubyte *) (pc
-                                                                              +
-                                                                              8),
-                                                           params));
-        (void) bswap_32_array((uint32_t *) params, 4);
-        __glXSendReplySwap(cl->client, params, 4, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDispSwap_ProgramNamedParameter4dvNV(GLbyte * pc)
-{
-    const GLsizei len = (GLsizei) bswap_CARD32(pc + 36);
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 44 + __GLX_PAD(len) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramNamedParameter4dvNV(GET_DISPATCH(), ((GLuint)
-                                                     bswap_CARD32(pc + 32), len,
-                                                     (const GLubyte *) (pc +
-                                                                        40),
-                                                     (const GLdouble *)
-                                                     bswap_64_array((uint64_t
-                                                                     *) (pc +
-                                                                         0), 4)
-                                    ));
-}
-
-void
-__glXDispSwap_ProgramNamedParameter4fvNV(GLbyte * pc)
-{
-    const GLsizei len = (GLsizei) bswap_CARD32(pc + 4);
-
-    CALL_ProgramNamedParameter4fvNV(GET_DISPATCH(), ((GLuint)
-                                                     bswap_CARD32(pc + 0), len,
-                                                     (const GLubyte *) (pc +
-                                                                        24),
-                                                     (const GLfloat *)
-                                                     bswap_32_array((uint32_t
-                                                                     *) (pc +
-                                                                         8), 4)
-                                    ));
-}
-
-void
-__glXDispSwap_BlendEquationSeparateEXT(GLbyte * pc)
-{
-    CALL_BlendEquationSeparateEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                   (GLenum) bswap_ENUM(pc + 4)
-                                  ));
-}
-
-void
-__glXDispSwap_BindFramebufferEXT(GLbyte * pc)
-{
-    CALL_BindFramebufferEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                             (GLuint) bswap_CARD32(pc + 4)
-                            ));
-}
-
-void
-__glXDispSwap_BindRenderbufferEXT(GLbyte * pc)
-{
-    CALL_BindRenderbufferEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (GLuint) bswap_CARD32(pc + 4)
-                             ));
-}
-
-int
-__glXDispSwap_CheckFramebufferStatusEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLenum retval;
-
-        retval = CALL_CheckFramebufferStatusEXT(GET_DISPATCH(), ((GLenum)
-                                                                 bswap_ENUM(pc +
-                                                                            0)
-                                                ));
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDispSwap_DeleteFramebuffersEXT(GLbyte * pc)
-{
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-    CALL_DeleteFramebuffersEXT(GET_DISPATCH(), (n,
-                                                (const GLuint *)
-                                                bswap_32_array((uint32_t *) (pc
-                                                                             +
-                                                                             4),
-                                                               0)
-                               ));
-}
-
-void
-__glXDispSwap_DeleteRenderbuffersEXT(GLbyte * pc)
-{
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-    CALL_DeleteRenderbuffersEXT(GET_DISPATCH(), (n,
-                                                 (const GLuint *)
-                                                 bswap_32_array((uint32_t *) (pc
-                                                                              +
-                                                                              4),
-                                                                0)
-                                ));
-}
-
-void
-__glXDispSwap_FramebufferRenderbufferEXT(GLbyte * pc)
-{
-    CALL_FramebufferRenderbufferEXT(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLenum) bswap_ENUM(pc +
-                                                                         4),
-                                                     (GLenum) bswap_ENUM(pc +
-                                                                         8),
-                                                     (GLuint) bswap_CARD32(pc +
-                                                                           12)
-                                    ));
-}
-
-void
-__glXDispSwap_FramebufferTexture1DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture1DEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLenum) bswap_ENUM(pc + 4),
-                                                  (GLenum) bswap_ENUM(pc + 8),
-                                                  (GLuint) bswap_CARD32(pc +
-                                                                        12),
-                                                  (GLint) bswap_CARD32(pc + 16)
-                                 ));
-}
-
-void
-__glXDispSwap_FramebufferTexture2DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture2DEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLenum) bswap_ENUM(pc + 4),
-                                                  (GLenum) bswap_ENUM(pc + 8),
-                                                  (GLuint) bswap_CARD32(pc +
-                                                                        12),
-                                                  (GLint) bswap_CARD32(pc + 16)
-                                 ));
-}
-
-void
-__glXDispSwap_FramebufferTexture3DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture3DEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLenum) bswap_ENUM(pc + 4),
-                                                  (GLenum) bswap_ENUM(pc + 8),
-                                                  (GLuint) bswap_CARD32(pc +
-                                                                        12),
-                                                  (GLint) bswap_CARD32(pc + 16),
-                                                  (GLint) bswap_CARD32(pc + 20)
-                                 ));
-}
-
-int
-__glXDispSwap_GenFramebuffersEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-        GLuint answerBuffer[200];
-        GLuint *framebuffers =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenFramebuffersEXT(GET_DISPATCH(), (n, framebuffers));
-        (void) bswap_32_array((uint32_t *) framebuffers, n);
-        __glXSendReplySwap(cl->client, framebuffers, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDispSwap_GenRenderbuffersEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-        GLuint answerBuffer[200];
-        GLuint *renderbuffers =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenRenderbuffersEXT(GET_DISPATCH(), (n, renderbuffers));
-        (void) bswap_32_array((uint32_t *) renderbuffers, n);
-        __glXSendReplySwap(cl->client, renderbuffers, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDispSwap_GenerateMipmapEXT(GLbyte * pc)
-{
-    CALL_GenerateMipmapEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                           ));
-}
-
-int
-__glXDispSwap_GetFramebufferAttachmentParameterivEXT(__GLXclientState * cl,
-                                                     GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLint params[1];
-
-        CALL_GetFramebufferAttachmentParameterivEXT(GET_DISPATCH(), ((GLenum)
-                                                                     bswap_ENUM
-                                                                     (pc + 0),
-                                                                     (GLenum)
-                                                                     bswap_ENUM
-                                                                     (pc + 4),
-                                                                     (GLenum)
-                                                                     bswap_ENUM
-                                                                     (pc + 8),
-                                                                     params));
-        (void) bswap_32_array((uint32_t *) params, 1);
-        __glXSendReplySwap(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDispSwap_GetRenderbufferParameterivEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLint params[1];
-
-        CALL_GetRenderbufferParameterivEXT(GET_DISPATCH(), ((GLenum)
-                                                            bswap_ENUM(pc + 0),
-                                                            (GLenum)
-                                                            bswap_ENUM(pc + 4),
-                                                            params));
-        (void) bswap_32_array((uint32_t *) params, 1);
-        __glXSendReplySwap(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDispSwap_IsFramebufferEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLboolean retval;
-
-        retval = CALL_IsFramebufferEXT(GET_DISPATCH(), ((GLuint)
-                                                        bswap_CARD32(pc + 0)
-                                       ));
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDispSwap_IsRenderbufferEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLboolean retval;
-
-        retval = CALL_IsRenderbufferEXT(GET_DISPATCH(), ((GLuint)
-                                                         bswap_CARD32(pc + 0)
-                                        ));
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDispSwap_RenderbufferStorageEXT(GLbyte * pc)
-{
-    CALL_RenderbufferStorageEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                 (GLenum) bswap_ENUM(pc + 4),
-                                                 (GLsizei) bswap_CARD32(pc + 8),
-                                                 (GLsizei) bswap_CARD32(pc + 12)
-                                ));
-}
-
-void
-__glXDispSwap_BlitFramebufferEXT(GLbyte * pc)
-{
-    CALL_BlitFramebufferEXT(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                             (GLint) bswap_CARD32(pc + 4),
-                                             (GLint) bswap_CARD32(pc + 8),
-                                             (GLint) bswap_CARD32(pc + 12),
-                                             (GLint) bswap_CARD32(pc + 16),
-                                             (GLint) bswap_CARD32(pc + 20),
-                                             (GLint) bswap_CARD32(pc + 24),
-                                             (GLint) bswap_CARD32(pc + 28),
-                                             (GLbitfield) bswap_CARD32(pc + 32),
-                                             (GLenum) bswap_ENUM(pc + 36)
-                            ));
-}
-
-void
-__glXDispSwap_FramebufferTextureLayerEXT(GLbyte * pc)
-{
-    CALL_FramebufferTextureLayerEXT(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLenum) bswap_ENUM(pc +
-                                                                         4),
-                                                     (GLuint) bswap_CARD32(pc +
-                                                                           8),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          12),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          16)
-                                    ));
+    glActiveStencilFaceEXT((GLenum) bswap_ENUM(pc + 0));
 }
diff --git a/xorg-server/glx/indirect_program.c b/xorg-server/glx/indirect_program.c
index 0114d7347..db22d845d 100644
--- a/xorg-server/glx/indirect_program.c
+++ b/xorg-server/glx/indirect_program.c
@@ -40,28 +40,15 @@
 #include "unpack.h"
 #include "indirect_size_get.h"
 #include "indirect_dispatch.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
-
-static int DoGetProgramString(struct __GLXclientStateRec *cl, GLbyte * pc,
-                              unsigned get_programiv_offset,
-                              unsigned get_program_string_offset, Bool do_swap);
 
 /**
  * Handle both types of glGetProgramString calls.
- *
- * This single function handles both \c glGetProgramStringARB and
- * \c glGetProgramStringNV.  The dispatch offsets for the functions to use
- * for \c glGetProgramivARB and \c glGetProgramStringARB are passed in by the
- * caller.  These can be the offsets of either the ARB versions or the NV
- * versions.
  */
-int
+static int
 DoGetProgramString(struct __GLXclientStateRec *cl, GLbyte * pc,
-                   unsigned get_programiv_offset,
-                   unsigned get_program_string_offset, Bool do_swap)
+                   PFNGLGETPROGRAMIVARBPROC get_programiv,
+                   PFNGLGETPROGRAMSTRINGARBPROC get_program_string,
+                   Bool do_swap)
 {
     xGLXVendorPrivateWithReplyReq *const req =
         (xGLXVendorPrivateWithReplyReq *) pc;
@@ -88,19 +75,13 @@ DoGetProgramString(struct __GLXclientStateRec *cl, GLbyte * pc,
         /* The value of the GL_PROGRAM_LENGTH_ARB and GL_PROGRAM_LENGTH_NV
          * enumerants is the same.
          */
-        CALL_by_offset(GET_DISPATCH(),
-                       (void (GLAPIENTRYP) (GLuint, GLenum, GLint *)),
-                       get_programiv_offset,
-                       (target, GL_PROGRAM_LENGTH_ARB, &compsize));
+        get_programiv(target, GL_PROGRAM_LENGTH_ARB, &compsize);
 
         if (compsize != 0) {
             __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
             __glXClearErrorOccured();
 
-            CALL_by_offset(GET_DISPATCH(),
-                           (void (GLAPIENTRYP) (GLuint, GLenum, GLubyte *)),
-                           get_program_string_offset,
-                           (target, pname, (GLubyte *) answer));
+            get_program_string(target, pname, (GLubyte *) answer);
         }
 
         if (__glXErrorOccured()) {
@@ -123,27 +104,29 @@ DoGetProgramString(struct __GLXclientStateRec *cl, GLbyte * pc,
 int
 __glXDisp_GetProgramStringARB(struct __GLXclientStateRec *cl, GLbyte * pc)
 {
-    return DoGetProgramString(cl, pc, _gloffset_GetProgramivARB,
-                              _gloffset_GetProgramStringARB, False);
+    return DoGetProgramString(cl, pc, glGetProgramivARB,
+                              glGetProgramStringARB, False);
 }
 
 int
 __glXDispSwap_GetProgramStringARB(struct __GLXclientStateRec *cl, GLbyte * pc)
 {
-    return DoGetProgramString(cl, pc, _gloffset_GetProgramivARB,
-                              _gloffset_GetProgramStringARB, True);
+    return DoGetProgramString(cl, pc, glGetProgramivARB,
+                              glGetProgramStringARB, True);
 }
 
 int
 __glXDisp_GetProgramStringNV(struct __GLXclientStateRec *cl, GLbyte * pc)
 {
-    return DoGetProgramString(cl, pc, _gloffset_GetProgramivNV,
-                              _gloffset_GetProgramStringNV, False);
+    return DoGetProgramString(cl, pc, (PFNGLGETPROGRAMIVARBPROC)glGetProgramivNV,
+                              (PFNGLGETPROGRAMSTRINGARBPROC)glGetProgramStringNV,
+                              False);
 }
 
 int
 __glXDispSwap_GetProgramStringNV(struct __GLXclientStateRec *cl, GLbyte * pc)
 {
-    return DoGetProgramString(cl, pc, _gloffset_GetProgramivNV,
-                              _gloffset_GetProgramStringNV, True);
+    return DoGetProgramString(cl, pc, (PFNGLGETPROGRAMIVARBPROC)glGetProgramivNV,
+                              (PFNGLGETPROGRAMSTRINGARBPROC)glGetProgramStringNV,
+                              True);
 }
diff --git a/xorg-server/glx/indirect_reqsize.c b/xorg-server/glx/indirect_reqsize.c
index 86ea9700f..026afb6fb 100644
--- a/xorg-server/glx/indirect_reqsize.c
+++ b/xorg-server/glx/indirect_reqsize.c
@@ -613,7 +613,7 @@ __glXTexSubImage3DReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXCompressedTexImage1DARBReqSize(const GLbyte * pc, Bool swap)
+__glXCompressedTexImage1DReqSize(const GLbyte * pc, Bool swap)
 {
     GLsizei imageSize = *(GLsizei *) (pc + 20);
 
@@ -625,7 +625,7 @@ __glXCompressedTexImage1DARBReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXCompressedTexImage2DARBReqSize(const GLbyte * pc, Bool swap)
+__glXCompressedTexImage2DReqSize(const GLbyte * pc, Bool swap)
 {
     GLsizei imageSize = *(GLsizei *) (pc + 24);
 
@@ -637,7 +637,7 @@ __glXCompressedTexImage2DARBReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXCompressedTexImage3DARBReqSize(const GLbyte * pc, Bool swap)
+__glXCompressedTexImage3DReqSize(const GLbyte * pc, Bool swap)
 {
     GLsizei imageSize = *(GLsizei *) (pc + 28);
 
@@ -649,7 +649,7 @@ __glXCompressedTexImage3DARBReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXCompressedTexSubImage3DARBReqSize(const GLbyte * pc, Bool swap)
+__glXCompressedTexSubImage3DReqSize(const GLbyte * pc, Bool swap)
 {
     GLsizei imageSize = *(GLsizei *) (pc + 36);
 
@@ -661,31 +661,7 @@ __glXCompressedTexSubImage3DARBReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXProgramStringARBReqSize(const GLbyte * pc, Bool swap)
-{
-    GLsizei len = *(GLsizei *) (pc + 8);
-
-    if (swap) {
-        len = bswap_32(len);
-    }
-
-    return __GLX_PAD(len);
-}
-
-int
-__glXDrawBuffersARBReqSize(const GLbyte * pc, Bool swap)
-{
-    GLsizei n = *(GLsizei *) (pc + 0);
-
-    if (swap) {
-        n = bswap_32(n);
-    }
-
-    return __GLX_PAD((n * 4));
-}
-
-int
-__glXPointParameterfvEXTReqSize(const GLbyte * pc, Bool swap)
+__glXPointParameterfvReqSize(const GLbyte * pc, Bool swap)
 {
     GLenum pname = *(GLenum *) (pc + 0);
     GLsizei compsize;
@@ -694,32 +670,32 @@ __glXPointParameterfvEXTReqSize(const GLbyte * pc, Bool swap)
         pname = bswap_32(pname);
     }
 
-    compsize = __glPointParameterfvEXT_size(pname);
+    compsize = __glPointParameterfv_size(pname);
     return __GLX_PAD((compsize * 4));
 }
 
 int
-__glXProgramParameters4dvNVReqSize(const GLbyte * pc, Bool swap)
+__glXDrawBuffersReqSize(const GLbyte * pc, Bool swap)
 {
-    GLsizei num = *(GLsizei *) (pc + 8);
+    GLsizei n = *(GLsizei *) (pc + 0);
 
     if (swap) {
-        num = bswap_32(num);
+        n = bswap_32(n);
     }
 
-    return __GLX_PAD((num * 32));
+    return __GLX_PAD((n * 4));
 }
 
 int
-__glXProgramParameters4fvNVReqSize(const GLbyte * pc, Bool swap)
+__glXProgramStringARBReqSize(const GLbyte * pc, Bool swap)
 {
-    GLsizei num = *(GLsizei *) (pc + 8);
+    GLsizei len = *(GLsizei *) (pc + 8);
 
     if (swap) {
-        num = bswap_32(num);
+        len = bswap_32(len);
     }
 
-    return __GLX_PAD((num * 16));
+    return __GLX_PAD(len);
 }
 
 int
@@ -794,18 +770,6 @@ __glXVertexAttribs4dvNVReqSize(const GLbyte * pc, Bool swap)
     return __GLX_PAD((n * 32));
 }
 
-int
-__glXProgramNamedParameter4fvNVReqSize(const GLbyte * pc, Bool swap)
-{
-    GLsizei len = *(GLsizei *) (pc + 4);
-
-    if (swap) {
-        len = bswap_32(len);
-    }
-
-    return __GLX_PAD(len);
-}
-
 ALIAS(Fogiv, Fogfv)
     ALIAS(Lightiv, Lightfv)
     ALIAS(LightModeliv, LightModelfv)
@@ -816,10 +780,11 @@ ALIAS(Fogiv, Fogfv)
     ALIAS(PixelMapuiv, PixelMapfv)
     ALIAS(ColorTableParameteriv, ColorTableParameterfv)
     ALIAS(ConvolutionParameteriv, ConvolutionParameterfv)
-    ALIAS(CompressedTexSubImage1DARB, CompressedTexImage1DARB)
-    ALIAS(CompressedTexSubImage2DARB, CompressedTexImage3DARB)
-    ALIAS(LoadProgramNV, ProgramStringARB)
-    ALIAS(RequestResidentProgramsNV, DrawBuffersARB)
+    ALIAS(CompressedTexSubImage1D, CompressedTexImage1D)
+    ALIAS(CompressedTexSubImage2D, CompressedTexImage3D)
+    ALIAS(PointParameteriv, PointParameterfv)
+    ALIAS(DeleteFramebuffers, DrawBuffers)
+    ALIAS(DeleteRenderbuffers, DrawBuffers)
     ALIAS(VertexAttribs1fvNV, PixelMapfv)
     ALIAS(VertexAttribs1svNV, PixelMapusv)
     ALIAS(VertexAttribs2fvNV, VertexAttribs1dvNV)
@@ -827,7 +792,3 @@ ALIAS(Fogiv, Fogfv)
     ALIAS(VertexAttribs4fvNV, VertexAttribs2dvNV)
     ALIAS(VertexAttribs4svNV, VertexAttribs1dvNV)
     ALIAS(VertexAttribs4ubvNV, PixelMapfv)
-    ALIAS(PointParameterivNV, PointParameterfvEXT)
-    ALIAS(ProgramNamedParameter4dvNV, CompressedTexSubImage3DARB)
-    ALIAS(DeleteFramebuffersEXT, DrawBuffersARB)
-    ALIAS(DeleteRenderbuffersEXT, DrawBuffersARB)
diff --git a/xorg-server/glx/indirect_reqsize.h b/xorg-server/glx/indirect_reqsize.h
index d2c1da762..43e1e69e3 100644
--- a/xorg-server/glx/indirect_reqsize.h
+++ b/xorg-server/glx/indirect_reqsize.h
@@ -96,32 +96,29 @@ extern PURE _X_HIDDEN int __glXSeparableFilter2DReqSize(const GLbyte * pc,
 extern PURE _X_HIDDEN int __glXTexImage3DReqSize(const GLbyte * pc, Bool swap);
 extern PURE _X_HIDDEN int __glXTexSubImage3DReqSize(const GLbyte * pc,
                                                     Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexImage1DARBReqSize(const GLbyte * pc,
+extern PURE _X_HIDDEN int __glXCompressedTexImage1DReqSize(const GLbyte * pc,
+                                                           Bool swap);
+extern PURE _X_HIDDEN int __glXCompressedTexImage2DReqSize(const GLbyte * pc,
+                                                           Bool swap);
+extern PURE _X_HIDDEN int __glXCompressedTexImage3DReqSize(const GLbyte * pc,
+                                                           Bool swap);
+extern PURE _X_HIDDEN int __glXCompressedTexSubImage1DReqSize(const GLbyte * pc,
                                                               Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexImage2DARBReqSize(const GLbyte * pc,
+extern PURE _X_HIDDEN int __glXCompressedTexSubImage2DReqSize(const GLbyte * pc,
                                                               Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexImage3DARBReqSize(const GLbyte * pc,
+extern PURE _X_HIDDEN int __glXCompressedTexSubImage3DReqSize(const GLbyte * pc,
                                                               Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexSubImage1DARBReqSize(const GLbyte *
-                                                                 pc, Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexSubImage2DARBReqSize(const GLbyte *
-                                                                 pc, Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexSubImage3DARBReqSize(const GLbyte *
-                                                                 pc, Bool swap);
+extern PURE _X_HIDDEN int __glXPointParameterfvReqSize(const GLbyte * pc,
+                                                       Bool swap);
+extern PURE _X_HIDDEN int __glXPointParameterivReqSize(const GLbyte * pc,
+                                                       Bool swap);
+extern PURE _X_HIDDEN int __glXDrawBuffersReqSize(const GLbyte * pc, Bool swap);
 extern PURE _X_HIDDEN int __glXProgramStringARBReqSize(const GLbyte * pc,
                                                        Bool swap);
-extern PURE _X_HIDDEN int __glXDrawBuffersARBReqSize(const GLbyte * pc,
-                                                     Bool swap);
-extern PURE _X_HIDDEN int __glXPointParameterfvEXTReqSize(const GLbyte * pc,
+extern PURE _X_HIDDEN int __glXDeleteFramebuffersReqSize(const GLbyte * pc,
+                                                         Bool swap);
+extern PURE _X_HIDDEN int __glXDeleteRenderbuffersReqSize(const GLbyte * pc,
                                                           Bool swap);
-extern PURE _X_HIDDEN int __glXLoadProgramNVReqSize(const GLbyte * pc,
-                                                    Bool swap);
-extern PURE _X_HIDDEN int __glXProgramParameters4dvNVReqSize(const GLbyte * pc,
-                                                             Bool swap);
-extern PURE _X_HIDDEN int __glXProgramParameters4fvNVReqSize(const GLbyte * pc,
-                                                             Bool swap);
-extern PURE _X_HIDDEN int __glXRequestResidentProgramsNVReqSize(const GLbyte *
-                                                                pc, Bool swap);
 extern PURE _X_HIDDEN int __glXVertexAttribs1dvNVReqSize(const GLbyte * pc,
                                                          Bool swap);
 extern PURE _X_HIDDEN int __glXVertexAttribs1fvNVReqSize(const GLbyte * pc,
@@ -148,16 +145,6 @@ extern PURE _X_HIDDEN int __glXVertexAttribs4svNVReqSize(const GLbyte * pc,
                                                          Bool swap);
 extern PURE _X_HIDDEN int __glXVertexAttribs4ubvNVReqSize(const GLbyte * pc,
                                                           Bool swap);
-extern PURE _X_HIDDEN int __glXPointParameterivNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXProgramNamedParameter4dvNVReqSize(const GLbyte *
-                                                                 pc, Bool swap);
-extern PURE _X_HIDDEN int __glXProgramNamedParameter4fvNVReqSize(const GLbyte *
-                                                                 pc, Bool swap);
-extern PURE _X_HIDDEN int __glXDeleteFramebuffersEXTReqSize(const GLbyte * pc,
-                                                            Bool swap);
-extern PURE _X_HIDDEN int __glXDeleteRenderbuffersEXTReqSize(const GLbyte * pc,
-                                                             Bool swap);
 
 #undef PURE
 
diff --git a/xorg-server/glx/indirect_size.h b/xorg-server/glx/indirect_size.h
index 56ffc1c68..fec7ed393 100644
--- a/xorg-server/glx/indirect_size.h
+++ b/xorg-server/glx/indirect_size.h
@@ -72,12 +72,14 @@ extern _X_INTERNAL PURE FASTCALL GLint __glMap2d_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glMap2f_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glColorTableParameterfv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glColorTableParameteriv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glConvolutionParameterfv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glConvolutionParameteriv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterfvEXT_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterivNV_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint
+__glConvolutionParameterfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint
+__glConvolutionParameteriv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glPointParameteriv_size(GLenum);
 
 #undef PURE
 #undef FASTCALL
 
-#endif                          /* !defined( _INDIRECT_SIZE_H_ ) */
+#endif /* !defined( _INDIRECT_SIZE_H_ ) */
diff --git a/xorg-server/glx/indirect_size_get.c b/xorg-server/glx/indirect_size_get.c
index da3a6cb85..f87931193 100644
--- a/xorg-server/glx/indirect_size_get.c
+++ b/xorg-server/glx/indirect_size_get.c
@@ -25,6 +25,7 @@
  * SOFTWARE.
  */
 
+
 #include <X11/Xfuncproto.h>
 #include <GL/gl.h>
 #include "indirect_size_get.h"
@@ -44,6 +45,7 @@
 #define FASTCALL
 #endif
 
+
 #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)
 #undef HAVE_ALIAS
 #endif
@@ -58,6 +60,7 @@
     { return __gl ## to ## _size( e ); }
 #endif
 
+
 _X_INTERNAL PURE FASTCALL GLint
 __glCallLists_size(GLenum e)
 {
@@ -599,6 +602,7 @@ __glGetBooleanv_size(GLenum e)
     case GL_OCCLUSION_TEST_HP:
     case GL_OCCLUSION_TEST_RESULT_HP:
     case GL_LIGHT_MODEL_COLOR_CONTROL:
+    case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB:
     case GL_RESET_NOTIFICATION_STRATEGY_ARB:
     case GL_CURRENT_FOG_COORD:
     case GL_FOG_COORDINATE_ARRAY_TYPE:
@@ -664,11 +668,11 @@ __glGetBooleanv_size(GLenum e)
     case GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI:
     case GL_FRAGMENT_PROGRAM_ARB:
     case GL_MAX_DRAW_BUFFERS_ARB:
-/*      case GL_MAX_DRAW_BUFFERS_NV:*/
+/*      case GL_MAX_DRAW_BUFFERS_ATI:*/
     case GL_DRAW_BUFFER0_ARB:
 /*      case GL_DRAW_BUFFER0_ATI:*/
     case GL_DRAW_BUFFER1_ARB:
-/*      case GL_DRAW_BUFFER1_NV:*/
+/*      case GL_DRAW_BUFFER1_ATI:*/
     case GL_DRAW_BUFFER2_ARB:
 /*      case GL_DRAW_BUFFER2_ATI:*/
     case GL_DRAW_BUFFER3_ARB:
@@ -686,15 +690,15 @@ __glGetBooleanv_size(GLenum e)
     case GL_DRAW_BUFFER9_ARB:
 /*      case GL_DRAW_BUFFER9_ATI:*/
     case GL_DRAW_BUFFER10_ARB:
-/*      case GL_DRAW_BUFFER10_NV:*/
+/*      case GL_DRAW_BUFFER10_ATI:*/
     case GL_DRAW_BUFFER11_ARB:
-/*      case GL_DRAW_BUFFER11_NV:*/
+/*      case GL_DRAW_BUFFER11_ATI:*/
     case GL_DRAW_BUFFER12_ARB:
 /*      case GL_DRAW_BUFFER12_ATI:*/
     case GL_DRAW_BUFFER13_ARB:
 /*      case GL_DRAW_BUFFER13_ATI:*/
     case GL_DRAW_BUFFER14_ARB:
-/*      case GL_DRAW_BUFFER14_NV:*/
+/*      case GL_DRAW_BUFFER14_ATI:*/
     case GL_DRAW_BUFFER15_ARB:
 /*      case GL_DRAW_BUFFER15_ATI:*/
     case GL_BLEND_EQUATION_ALPHA_EXT:
@@ -708,6 +712,7 @@ __glGetBooleanv_size(GLenum e)
     case GL_MATRIX_INDEX_ARRAY_TYPE_ARB:
     case GL_MATRIX_INDEX_ARRAY_STRIDE_ARB:
     case GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT:
+    case GL_TEXTURE_CUBE_MAP_SEAMLESS:
     case GL_POINT_SPRITE_ARB:
 /*      case GL_POINT_SPRITE_NV:*/
     case GL_POINT_SPRITE_R_MODE_NV:
@@ -726,7 +731,6 @@ __glGetBooleanv_size(GLenum e)
     case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
     case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
     case GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB:
-    case GL_TEXTURE_CUBE_MAP_SEAMLESS:
     case GL_MAX_ARRAY_TEXTURE_LAYERS_EXT:
     case GL_STENCIL_TEST_TWO_SIDE_EXT:
     case GL_ACTIVE_STENCIL_FACE_EXT:
@@ -744,6 +748,9 @@ __glGetBooleanv_size(GLenum e)
     case GL_MAX_SAMPLES:
 /*      case GL_MAX_SAMPLES_EXT:*/
     case GL_MAX_SERVER_WAIT_TIMEOUT:
+    case GL_MAX_DEBUG_MESSAGE_LENGTH_ARB:
+    case GL_MAX_DEBUG_LOGGED_MESSAGES_ARB:
+    case GL_DEBUG_LOGGED_MESSAGES_ARB:
     case GL_RASTER_POSITION_UNCLIPPED_IBM:
         return 1;
     case GL_SMOOTH_POINT_SIZE_RANGE:
@@ -917,6 +924,18 @@ __glGetTexLevelParameterfv_size(GLenum e)
 }
 
 _X_INTERNAL PURE FASTCALL GLint
+__glGetPointerv_size(GLenum e)
+{
+    switch (e) {
+    case GL_DEBUG_CALLBACK_FUNCTION_ARB:
+    case GL_DEBUG_CALLBACK_USER_PARAM_ARB:
+        return 1;
+    default:
+        return 0;
+    }
+}
+
+_X_INTERNAL PURE FASTCALL GLint
 __glColorTableParameterfv_size(GLenum e)
 {
     switch (e) {
@@ -1036,6 +1055,56 @@ __glGetMinmaxParameterfv_size(GLenum e)
 }
 
 _X_INTERNAL PURE FASTCALL GLint
+__glPointParameterfv_size(GLenum e)
+{
+    switch (e) {
+    case GL_POINT_SIZE_MIN:
+/*      case GL_POINT_SIZE_MIN_ARB:*/
+/*      case GL_POINT_SIZE_MIN_SGIS:*/
+    case GL_POINT_SIZE_MAX:
+/*      case GL_POINT_SIZE_MAX_ARB:*/
+/*      case GL_POINT_SIZE_MAX_SGIS:*/
+    case GL_POINT_FADE_THRESHOLD_SIZE:
+/*      case GL_POINT_FADE_THRESHOLD_SIZE_ARB:*/
+/*      case GL_POINT_FADE_THRESHOLD_SIZE_SGIS:*/
+    case GL_POINT_SPRITE_R_MODE_NV:
+    case GL_POINT_SPRITE_COORD_ORIGIN:
+        return 1;
+    case GL_POINT_DISTANCE_ATTENUATION:
+/*      case GL_POINT_DISTANCE_ATTENUATION_ARB:*/
+/*      case GL_POINT_DISTANCE_ATTENUATION_SGIS:*/
+        return 3;
+    default:
+        return 0;
+    }
+}
+
+_X_INTERNAL PURE FASTCALL GLint
+__glGetQueryObjectiv_size(GLenum e)
+{
+    switch (e) {
+    case GL_QUERY_RESULT_ARB:
+    case GL_QUERY_RESULT_AVAILABLE_ARB:
+        return 1;
+    default:
+        return 0;
+    }
+}
+
+_X_INTERNAL PURE FASTCALL GLint
+__glGetQueryiv_size(GLenum e)
+{
+    switch (e) {
+    case GL_QUERY_COUNTER_BITS_ARB:
+    case GL_CURRENT_QUERY_ARB:
+    case GL_ANY_SAMPLES_PASSED:
+        return 1;
+    default:
+        return 0;
+    }
+}
+
+_X_INTERNAL PURE FASTCALL GLint
 __glGetProgramivARB_size(GLenum e)
 {
     switch (e) {
@@ -1089,106 +1158,25 @@ __glGetProgramivARB_size(GLenum e)
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetVertexAttribdvARB_size(GLenum e)
-{
-    switch (e) {
-    case GL_VERTEX_PROGRAM_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB:
-    case GL_CURRENT_VERTEX_ATTRIB_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-_X_INTERNAL PURE FASTCALL GLint
-__glGetQueryObjectivARB_size(GLenum e)
-{
-    switch (e) {
-    case GL_QUERY_RESULT_ARB:
-    case GL_QUERY_RESULT_AVAILABLE_ARB:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-_X_INTERNAL PURE FASTCALL GLint
-__glGetQueryivARB_size(GLenum e)
-{
-    switch (e) {
-    case GL_QUERY_COUNTER_BITS_ARB:
-    case GL_CURRENT_QUERY_ARB:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-_X_INTERNAL PURE FASTCALL GLint
-__glPointParameterfvEXT_size(GLenum e)
-{
-    switch (e) {
-    case GL_POINT_SIZE_MIN:
-/*      case GL_POINT_SIZE_MIN_ARB:*/
-/*      case GL_POINT_SIZE_MIN_SGIS:*/
-    case GL_POINT_SIZE_MAX:
-/*      case GL_POINT_SIZE_MAX_ARB:*/
-/*      case GL_POINT_SIZE_MAX_SGIS:*/
-    case GL_POINT_FADE_THRESHOLD_SIZE:
-/*      case GL_POINT_FADE_THRESHOLD_SIZE_ARB:*/
-/*      case GL_POINT_FADE_THRESHOLD_SIZE_SGIS:*/
-    case GL_POINT_SPRITE_R_MODE_NV:
-    case GL_POINT_SPRITE_COORD_ORIGIN:
-        return 1;
-    case GL_POINT_DISTANCE_ATTENUATION:
-/*      case GL_POINT_DISTANCE_ATTENUATION_ARB:*/
-/*      case GL_POINT_DISTANCE_ATTENUATION_SGIS:*/
-        return 3;
-    default:
-        return 0;
-    }
-}
-
-_X_INTERNAL PURE FASTCALL GLint
-__glGetProgramivNV_size(GLenum e)
-{
-    switch (e) {
-    case GL_PROGRAM_LENGTH_NV:
-    case GL_PROGRAM_TARGET_NV:
-    case GL_PROGRAM_RESIDENT_NV:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-_X_INTERNAL PURE FASTCALL GLint
-__glGetVertexAttribdvNV_size(GLenum e)
-{
-    switch (e) {
-    case GL_ATTRIB_ARRAY_SIZE_NV:
-    case GL_ATTRIB_ARRAY_STRIDE_NV:
-    case GL_ATTRIB_ARRAY_TYPE_NV:
-    case GL_CURRENT_ATTRIB_NV:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-_X_INTERNAL PURE FASTCALL GLint
-__glGetFramebufferAttachmentParameterivEXT_size(GLenum e)
+__glGetFramebufferAttachmentParameteriv_size(GLenum e)
 {
     switch (e) {
-    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT:
-    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT:
-    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT:
-    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT:
+    case GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING:
+    case GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE:
+    case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:
+    case GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE:
+    case GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE:
+    case GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE:
+    case GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE:
+    case GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE:
+    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE:
+/*      case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT:*/
+    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME:
+/*      case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT:*/
+    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL:
+/*      case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT:*/
+    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE:
+/*      case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT:*/
     case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT:
         return 1;
     default:
@@ -1226,11 +1214,7 @@ ALIAS(Fogiv, Fogfv)
     ALIAS(GetConvolutionParameteriv, GetConvolutionParameterfv)
     ALIAS(GetHistogramParameteriv, GetHistogramParameterfv)
     ALIAS(GetMinmaxParameteriv, GetMinmaxParameterfv)
-    ALIAS(GetVertexAttribfvARB, GetVertexAttribdvARB)
-    ALIAS(GetVertexAttribivARB, GetVertexAttribdvARB)
-    ALIAS(GetQueryObjectuivARB, GetQueryObjectivARB)
-    ALIAS(GetVertexAttribfvNV, GetVertexAttribdvNV)
-    ALIAS(GetVertexAttribivNV, GetVertexAttribdvNV)
-    ALIAS(PointParameterivNV, PointParameterfvEXT)
+    ALIAS(PointParameteriv, PointParameterfv)
+    ALIAS(GetQueryObjectuiv, GetQueryObjectiv)
 #undef PURE
 #undef FASTCALL
diff --git a/xorg-server/glx/indirect_size_get.h b/xorg-server/glx/indirect_size_get.h
index 4cfb3a6ba..9b6203669 100644
--- a/xorg-server/glx/indirect_size_get.h
+++ b/xorg-server/glx/indirect_size_get.h
@@ -67,6 +67,7 @@ extern _X_INTERNAL PURE FASTCALL GLint __glGetTexParameterfv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetTexParameteriv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetTexLevelParameterfv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetTexLevelParameteriv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetPointerv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint
 __glGetColorTableParameterfv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint
@@ -79,19 +80,12 @@ extern _X_INTERNAL PURE FASTCALL GLint __glGetHistogramParameterfv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetHistogramParameteriv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetMinmaxParameterfv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetMinmaxParameteriv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectiv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectuiv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryiv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetProgramivARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribivARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectivARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectuivARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryivARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetProgramivNV_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvNV_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvNV_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribivNV_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint
-__glGetFramebufferAttachmentParameterivEXT_size(GLenum);
+__glGetFramebufferAttachmentParameteriv_size(GLenum);
 
 #undef PURE
 #undef FASTCALL
diff --git a/xorg-server/glx/indirect_table.c b/xorg-server/glx/indirect_table.c
index 8922e43fd..33e3d6a22 100644
--- a/xorg-server/glx/indirect_table.c
+++ b/xorg-server/glx/indirect_table.c
@@ -213,17 +213,16 @@ static const void *Single_function_table[112][2] = {
                           __glXDispSwap_GetMinmaxParameterfv},
     /* [ 103] =   159 */ {__glXDisp_GetMinmaxParameteriv,
                           __glXDispSwap_GetMinmaxParameteriv},
-    /* [ 104] =   160 */ {__glXDisp_GetCompressedTexImageARB,
-                          __glXDispSwap_GetCompressedTexImageARB},
-    /* [ 105] =   161 */ {__glXDisp_DeleteQueriesARB,
-                          __glXDispSwap_DeleteQueriesARB},
-    /* [ 106] =   162 */ {__glXDisp_GenQueriesARB, __glXDispSwap_GenQueriesARB},
-    /* [ 107] =   163 */ {__glXDisp_IsQueryARB, __glXDispSwap_IsQueryARB},
-    /* [ 108] =   164 */ {__glXDisp_GetQueryivARB, __glXDispSwap_GetQueryivARB},
-    /* [ 109] =   165 */ {__glXDisp_GetQueryObjectivARB,
-                          __glXDispSwap_GetQueryObjectivARB},
-    /* [ 110] =   166 */ {__glXDisp_GetQueryObjectuivARB,
-                          __glXDispSwap_GetQueryObjectuivARB},
+    /* [ 104] =   160 */ {__glXDisp_GetCompressedTexImage,
+                          __glXDispSwap_GetCompressedTexImage},
+    /* [ 105] =   161 */ {__glXDisp_DeleteQueries, __glXDispSwap_DeleteQueries},
+    /* [ 106] =   162 */ {__glXDisp_GenQueries, __glXDispSwap_GenQueries},
+    /* [ 107] =   163 */ {__glXDisp_IsQuery, __glXDispSwap_IsQuery},
+    /* [ 108] =   164 */ {__glXDisp_GetQueryiv, __glXDispSwap_GetQueryiv},
+    /* [ 109] =   165 */ {__glXDisp_GetQueryObjectiv,
+                          __glXDispSwap_GetQueryObjectiv},
+    /* [ 110] =   166 */ {__glXDisp_GetQueryObjectuiv,
+                          __glXDispSwap_GetQueryObjectuiv},
     /* [ 111] =   167 */ {NULL, NULL},
 };
 
@@ -576,52 +575,51 @@ static const void *Render_function_table[408][2] = {
     /* [ 195] =   195 */ {__glXDisp_ColorSubTable, __glXDispSwap_ColorSubTable},
     /* [ 196] =   196 */ {__glXDisp_CopyColorSubTable,
                           __glXDispSwap_CopyColorSubTable},
-    /* [ 197] =   197 */ {__glXDisp_ActiveTextureARB,
-                          __glXDispSwap_ActiveTextureARB},
-    /* [ 198] =   198 */ {__glXDisp_MultiTexCoord1dvARB,
-                          __glXDispSwap_MultiTexCoord1dvARB},
+    /* [ 197] =   197 */ {__glXDisp_ActiveTexture, __glXDispSwap_ActiveTexture},
+    /* [ 198] =   198 */ {__glXDisp_MultiTexCoord1dv,
+                          __glXDispSwap_MultiTexCoord1dv},
     /* [ 199] =   199 */ {__glXDisp_MultiTexCoord1fvARB,
                           __glXDispSwap_MultiTexCoord1fvARB},
-    /* [ 200] =   200 */ {__glXDisp_MultiTexCoord1ivARB,
-                          __glXDispSwap_MultiTexCoord1ivARB},
-    /* [ 201] =   201 */ {__glXDisp_MultiTexCoord1svARB,
-                          __glXDispSwap_MultiTexCoord1svARB},
-    /* [ 202] =   202 */ {__glXDisp_MultiTexCoord2dvARB,
-                          __glXDispSwap_MultiTexCoord2dvARB},
+    /* [ 200] =   200 */ {__glXDisp_MultiTexCoord1iv,
+                          __glXDispSwap_MultiTexCoord1iv},
+    /* [ 201] =   201 */ {__glXDisp_MultiTexCoord1sv,
+                          __glXDispSwap_MultiTexCoord1sv},
+    /* [ 202] =   202 */ {__glXDisp_MultiTexCoord2dv,
+                          __glXDispSwap_MultiTexCoord2dv},
     /* [ 203] =   203 */ {__glXDisp_MultiTexCoord2fvARB,
                           __glXDispSwap_MultiTexCoord2fvARB},
-    /* [ 204] =   204 */ {__glXDisp_MultiTexCoord2ivARB,
-                          __glXDispSwap_MultiTexCoord2ivARB},
-    /* [ 205] =   205 */ {__glXDisp_MultiTexCoord2svARB,
-                          __glXDispSwap_MultiTexCoord2svARB},
-    /* [ 206] =   206 */ {__glXDisp_MultiTexCoord3dvARB,
-                          __glXDispSwap_MultiTexCoord3dvARB},
+    /* [ 204] =   204 */ {__glXDisp_MultiTexCoord2iv,
+                          __glXDispSwap_MultiTexCoord2iv},
+    /* [ 205] =   205 */ {__glXDisp_MultiTexCoord2sv,
+                          __glXDispSwap_MultiTexCoord2sv},
+    /* [ 206] =   206 */ {__glXDisp_MultiTexCoord3dv,
+                          __glXDispSwap_MultiTexCoord3dv},
     /* [ 207] =   207 */ {__glXDisp_MultiTexCoord3fvARB,
                           __glXDispSwap_MultiTexCoord3fvARB},
-    /* [ 208] =   208 */ {__glXDisp_MultiTexCoord3ivARB,
-                          __glXDispSwap_MultiTexCoord3ivARB},
-    /* [ 209] =   209 */ {__glXDisp_MultiTexCoord3svARB,
-                          __glXDispSwap_MultiTexCoord3svARB},
-    /* [ 210] =   210 */ {__glXDisp_MultiTexCoord4dvARB,
-                          __glXDispSwap_MultiTexCoord4dvARB},
+    /* [ 208] =   208 */ {__glXDisp_MultiTexCoord3iv,
+                          __glXDispSwap_MultiTexCoord3iv},
+    /* [ 209] =   209 */ {__glXDisp_MultiTexCoord3sv,
+                          __glXDispSwap_MultiTexCoord3sv},
+    /* [ 210] =   210 */ {__glXDisp_MultiTexCoord4dv,
+                          __glXDispSwap_MultiTexCoord4dv},
     /* [ 211] =   211 */ {__glXDisp_MultiTexCoord4fvARB,
                           __glXDispSwap_MultiTexCoord4fvARB},
-    /* [ 212] =   212 */ {__glXDisp_MultiTexCoord4ivARB,
-                          __glXDispSwap_MultiTexCoord4ivARB},
-    /* [ 213] =   213 */ {__glXDisp_MultiTexCoord4svARB,
-                          __glXDispSwap_MultiTexCoord4svARB},
-    /* [ 214] =   214 */ {__glXDisp_CompressedTexImage1DARB,
-                          __glXDispSwap_CompressedTexImage1DARB},
-    /* [ 215] =   215 */ {__glXDisp_CompressedTexImage2DARB,
-                          __glXDispSwap_CompressedTexImage2DARB},
-    /* [ 216] =   216 */ {__glXDisp_CompressedTexImage3DARB,
-                          __glXDispSwap_CompressedTexImage3DARB},
-    /* [ 217] =   217 */ {__glXDisp_CompressedTexSubImage1DARB,
-                          __glXDispSwap_CompressedTexSubImage1DARB},
-    /* [ 218] =   218 */ {__glXDisp_CompressedTexSubImage2DARB,
-                          __glXDispSwap_CompressedTexSubImage2DARB},
-    /* [ 219] =   219 */ {__glXDisp_CompressedTexSubImage3DARB,
-                          __glXDispSwap_CompressedTexSubImage3DARB},
+    /* [ 212] =   212 */ {__glXDisp_MultiTexCoord4iv,
+                          __glXDispSwap_MultiTexCoord4iv},
+    /* [ 213] =   213 */ {__glXDisp_MultiTexCoord4sv,
+                          __glXDispSwap_MultiTexCoord4sv},
+    /* [ 214] =   214 */ {__glXDisp_CompressedTexImage1D,
+                          __glXDispSwap_CompressedTexImage1D},
+    /* [ 215] =   215 */ {__glXDisp_CompressedTexImage2D,
+                          __glXDispSwap_CompressedTexImage2D},
+    /* [ 216] =   216 */ {__glXDisp_CompressedTexImage3D,
+                          __glXDispSwap_CompressedTexImage3D},
+    /* [ 217] =   217 */ {__glXDisp_CompressedTexSubImage1D,
+                          __glXDispSwap_CompressedTexSubImage1D},
+    /* [ 218] =   218 */ {__glXDisp_CompressedTexSubImage2D,
+                          __glXDispSwap_CompressedTexSubImage2D},
+    /* [ 219] =   219 */ {__glXDisp_CompressedTexSubImage3D,
+                          __glXDispSwap_CompressedTexSubImage3D},
     /* [ 220] =   220 */ {NULL, NULL},
     /* [ 221] =   221 */ {NULL, NULL},
     /* [ 222] =   222 */ {NULL, NULL},
@@ -631,25 +629,21 @@ static const void *Render_function_table[408][2] = {
     /* [ 226] =   226 */ {NULL, NULL},
     /* [ 227] =   227 */ {NULL, NULL},
     /* [ 228] =   228 */ {NULL, NULL},
-    /* [ 229] =   229 */ {__glXDisp_SampleCoverageARB,
-                          __glXDispSwap_SampleCoverageARB},
-    /* [ 230] =   230 */ {__glXDisp_WindowPos3fvMESA,
-                          __glXDispSwap_WindowPos3fvMESA},
-    /* [ 231] =   231 */ {__glXDisp_BeginQueryARB, __glXDispSwap_BeginQueryARB},
-    /* [ 232] =   232 */ {__glXDisp_EndQueryARB, __glXDispSwap_EndQueryARB},
-    /* [ 233] =   233 */ {__glXDisp_DrawBuffersARB,
-                          __glXDispSwap_DrawBuffersARB},
-    /* [ 234] =   234 */ {__glXDisp_ClampColorARB, __glXDispSwap_ClampColorARB},
+    /* [ 229] =   229 */ {__glXDisp_SampleCoverage,
+                          __glXDispSwap_SampleCoverage},
+    /* [ 230] =   230 */ {__glXDisp_WindowPos3fv, __glXDispSwap_WindowPos3fv},
+    /* [ 231] =   231 */ {__glXDisp_BeginQuery, __glXDispSwap_BeginQuery},
+    /* [ 232] =   232 */ {__glXDisp_EndQuery, __glXDispSwap_EndQuery},
+    /* [ 233] =   233 */ {__glXDisp_DrawBuffers, __glXDispSwap_DrawBuffers},
+    /* [ 234] =   234 */ {__glXDisp_ClampColor, __glXDispSwap_ClampColor},
     /* [ 235] =   235 */ {NULL, NULL},
     /* [ 236] =   236 */ {NULL, NULL},
-    /* [ 237] =   237 */ {__glXDisp_FramebufferTextureLayerEXT,
-                          __glXDispSwap_FramebufferTextureLayerEXT},
+    /* [ 237] =   237 */ {__glXDisp_FramebufferTextureLayer,
+                          __glXDispSwap_FramebufferTextureLayer},
     /* [ 238] =   238 */ {NULL, NULL},
     /* [ 239] =   239 */ {NULL, NULL},
-    /* [ 240] =  2048 */ {__glXDisp_SampleMaskSGIS,
-                          __glXDispSwap_SampleMaskSGIS},
-    /* [ 241] =  2049 */ {__glXDisp_SamplePatternSGIS,
-                          __glXDispSwap_SamplePatternSGIS},
+    /* [ 240] =  2048 */ {NULL, NULL},
+    /* [ 241] =  2049 */ {NULL, NULL},
     /* [ 242] =  2050 */ {NULL, NULL},
     /* [ 243] =  2051 */ {NULL, NULL},
     /* [ 244] =  2052 */ {NULL, NULL},
@@ -668,10 +662,10 @@ static const void *Render_function_table[408][2] = {
     /* [ 254] =  2062 */ {NULL, NULL},
     /* [ 255] =  2063 */ {NULL, NULL},
     /* [ 256] =  2064 */ {NULL, NULL},
-    /* [ 257] =  2065 */ {__glXDisp_PointParameterfEXT,
-                          __glXDispSwap_PointParameterfEXT},
-    /* [ 258] =  2066 */ {__glXDisp_PointParameterfvEXT,
-                          __glXDispSwap_PointParameterfvEXT},
+    /* [ 257] =  2065 */ {__glXDisp_PointParameterf,
+                          __glXDispSwap_PointParameterf},
+    /* [ 258] =  2066 */ {__glXDisp_PointParameterfv,
+                          __glXDispSwap_PointParameterfv},
     /* [ 259] =  2067 */ {NULL, NULL},
     /* [ 260] =  2068 */ {NULL, NULL},
     /* [ 261] =  2069 */ {NULL, NULL},
@@ -722,38 +716,35 @@ static const void *Render_function_table[408][2] = {
     /* [ 291] =  4123 */ {__glXDisp_CopyTexSubImage3D,
                           __glXDispSwap_CopyTexSubImage3D},
     /* [ 292] =  4124 */ {__glXDisp_FogCoordfvEXT, __glXDispSwap_FogCoordfvEXT},
-    /* [ 293] =  4125 */ {__glXDisp_FogCoorddvEXT, __glXDispSwap_FogCoorddvEXT},
-    /* [ 294] =  4126 */ {__glXDisp_SecondaryColor3bvEXT,
-                          __glXDispSwap_SecondaryColor3bvEXT},
-    /* [ 295] =  4127 */ {__glXDisp_SecondaryColor3svEXT,
-                          __glXDispSwap_SecondaryColor3svEXT},
+    /* [ 293] =  4125 */ {__glXDisp_FogCoorddv, __glXDispSwap_FogCoorddv},
+    /* [ 294] =  4126 */ {__glXDisp_SecondaryColor3bv,
+                          __glXDispSwap_SecondaryColor3bv},
+    /* [ 295] =  4127 */ {__glXDisp_SecondaryColor3sv,
+                          __glXDispSwap_SecondaryColor3sv},
     /* [ 296] =  4176 */ {NULL, NULL},
     /* [ 297] =  4177 */ {NULL, NULL},
     /* [ 298] =  4178 */ {NULL, NULL},
     /* [ 299] =  4179 */ {NULL, NULL},
-    /* [ 300] =  4180 */ {__glXDisp_BindProgramNV, __glXDispSwap_BindProgramNV},
-    /* [ 301] =  4181 */ {__glXDisp_ExecuteProgramNV,
-                          __glXDispSwap_ExecuteProgramNV},
-    /* [ 302] =  4182 */ {__glXDisp_RequestResidentProgramsNV,
-                          __glXDispSwap_RequestResidentProgramsNV},
-    /* [ 303] =  4183 */ {__glXDisp_LoadProgramNV, __glXDispSwap_LoadProgramNV},
+    /* [ 300] =  4180 */ {__glXDisp_BindProgramARB,
+                          __glXDispSwap_BindProgramARB},
+    /* [ 301] =  4181 */ {NULL, NULL},
+    /* [ 302] =  4182 */ {NULL, NULL},
+    /* [ 303] =  4183 */ {NULL, NULL},
     /* [ 304] =  4184 */ {__glXDisp_ProgramEnvParameter4fvARB,
                           __glXDispSwap_ProgramEnvParameter4fvARB},
     /* [ 305] =  4185 */ {__glXDisp_ProgramEnvParameter4dvARB,
                           __glXDispSwap_ProgramEnvParameter4dvARB},
-    /* [ 306] =  4186 */ {__glXDisp_ProgramParameters4fvNV,
-                          __glXDispSwap_ProgramParameters4fvNV},
-    /* [ 307] =  4187 */ {__glXDisp_ProgramParameters4dvNV,
-                          __glXDispSwap_ProgramParameters4dvNV},
-    /* [ 308] =  4188 */ {__glXDisp_TrackMatrixNV, __glXDispSwap_TrackMatrixNV},
-    /* [ 309] =  4189 */ {__glXDisp_VertexAttrib1svARB,
-                          __glXDispSwap_VertexAttrib1svARB},
-    /* [ 310] =  4190 */ {__glXDisp_VertexAttrib2svARB,
-                          __glXDispSwap_VertexAttrib2svARB},
-    /* [ 311] =  4191 */ {__glXDisp_VertexAttrib3svARB,
-                          __glXDispSwap_VertexAttrib3svARB},
-    /* [ 312] =  4192 */ {__glXDisp_VertexAttrib4svARB,
-                          __glXDispSwap_VertexAttrib4svARB},
+    /* [ 306] =  4186 */ {NULL, NULL},
+    /* [ 307] =  4187 */ {NULL, NULL},
+    /* [ 308] =  4188 */ {NULL, NULL},
+    /* [ 309] =  4189 */ {__glXDisp_VertexAttrib1sv,
+                          __glXDispSwap_VertexAttrib1sv},
+    /* [ 310] =  4190 */ {__glXDisp_VertexAttrib2sv,
+                          __glXDispSwap_VertexAttrib2sv},
+    /* [ 311] =  4191 */ {__glXDisp_VertexAttrib3sv,
+                          __glXDispSwap_VertexAttrib3sv},
+    /* [ 312] =  4192 */ {__glXDisp_VertexAttrib4sv,
+                          __glXDispSwap_VertexAttrib4sv},
     /* [ 313] =  4193 */ {__glXDisp_VertexAttrib1fvARB,
                           __glXDispSwap_VertexAttrib1fvARB},
     /* [ 314] =  4194 */ {__glXDisp_VertexAttrib2fvARB,
@@ -762,16 +753,16 @@ static const void *Render_function_table[408][2] = {
                           __glXDispSwap_VertexAttrib3fvARB},
     /* [ 316] =  4196 */ {__glXDisp_VertexAttrib4fvARB,
                           __glXDispSwap_VertexAttrib4fvARB},
-    /* [ 317] =  4197 */ {__glXDisp_VertexAttrib1dvARB,
-                          __glXDispSwap_VertexAttrib1dvARB},
-    /* [ 318] =  4198 */ {__glXDisp_VertexAttrib2dvARB,
-                          __glXDispSwap_VertexAttrib2dvARB},
-    /* [ 319] =  4199 */ {__glXDisp_VertexAttrib3dvARB,
-                          __glXDispSwap_VertexAttrib3dvARB},
-    /* [ 320] =  4200 */ {__glXDisp_VertexAttrib4dvARB,
-                          __glXDispSwap_VertexAttrib4dvARB},
-    /* [ 321] =  4201 */ {__glXDisp_VertexAttrib4NubvARB,
-                          __glXDispSwap_VertexAttrib4NubvARB},
+    /* [ 317] =  4197 */ {__glXDisp_VertexAttrib1dv,
+                          __glXDispSwap_VertexAttrib1dv},
+    /* [ 318] =  4198 */ {__glXDisp_VertexAttrib2dv,
+                          __glXDispSwap_VertexAttrib2dv},
+    /* [ 319] =  4199 */ {__glXDisp_VertexAttrib3dv,
+                          __glXDispSwap_VertexAttrib3dv},
+    /* [ 320] =  4200 */ {__glXDisp_VertexAttrib4dv,
+                          __glXDispSwap_VertexAttrib4dv},
+    /* [ 321] =  4201 */ {__glXDisp_VertexAttrib4Nubv,
+                          __glXDispSwap_VertexAttrib4Nubv},
     /* [ 322] =  4202 */ {__glXDisp_VertexAttribs1svNV,
                           __glXDispSwap_VertexAttribs1svNV},
     /* [ 323] =  4203 */ {__glXDisp_VertexAttribs2svNV,
@@ -804,82 +795,80 @@ static const void *Render_function_table[408][2] = {
                           __glXDispSwap_ProgramLocalParameter4dvARB},
     /* [ 337] =  4217 */ {__glXDisp_ProgramStringARB,
                           __glXDispSwap_ProgramStringARB},
-    /* [ 338] =  4218 */ {__glXDisp_ProgramNamedParameter4fvNV,
-                          __glXDispSwap_ProgramNamedParameter4fvNV},
-    /* [ 339] =  4219 */ {__glXDisp_ProgramNamedParameter4dvNV,
-                          __glXDispSwap_ProgramNamedParameter4dvNV},
+    /* [ 338] =  4218 */ {NULL, NULL},
+    /* [ 339] =  4219 */ {NULL, NULL},
     /* [ 340] =  4220 */ {__glXDisp_ActiveStencilFaceEXT,
                           __glXDispSwap_ActiveStencilFaceEXT},
-    /* [ 341] =  4221 */ {__glXDisp_PointParameteriNV,
-                          __glXDispSwap_PointParameteriNV},
-    /* [ 342] =  4222 */ {__glXDisp_PointParameterivNV,
-                          __glXDispSwap_PointParameterivNV},
+    /* [ 341] =  4221 */ {__glXDisp_PointParameteri,
+                          __glXDispSwap_PointParameteri},
+    /* [ 342] =  4222 */ {__glXDisp_PointParameteriv,
+                          __glXDispSwap_PointParameteriv},
     /* [ 343] =  4223 */ {NULL, NULL},
     /* [ 344] =  4224 */ {NULL, NULL},
     /* [ 345] =  4225 */ {NULL, NULL},
     /* [ 346] =  4226 */ {NULL, NULL},
     /* [ 347] =  4227 */ {NULL, NULL},
-    /* [ 348] =  4228 */ {__glXDisp_BlendEquationSeparateEXT,
-                          __glXDispSwap_BlendEquationSeparateEXT},
+    /* [ 348] =  4228 */ {__glXDisp_BlendEquationSeparate,
+                          __glXDispSwap_BlendEquationSeparate},
     /* [ 349] =  4229 */ {NULL, NULL},
-    /* [ 350] =  4230 */ {__glXDisp_VertexAttrib4bvARB,
-                          __glXDispSwap_VertexAttrib4bvARB},
-    /* [ 351] =  4231 */ {__glXDisp_VertexAttrib4ivARB,
-                          __glXDispSwap_VertexAttrib4ivARB},
-    /* [ 352] =  4232 */ {__glXDisp_VertexAttrib4ubvARB,
-                          __glXDispSwap_VertexAttrib4ubvARB},
-    /* [ 353] =  4233 */ {__glXDisp_VertexAttrib4usvARB,
-                          __glXDispSwap_VertexAttrib4usvARB},
-    /* [ 354] =  4234 */ {__glXDisp_VertexAttrib4uivARB,
-                          __glXDispSwap_VertexAttrib4uivARB},
-    /* [ 355] =  4235 */ {__glXDisp_VertexAttrib4NbvARB,
-                          __glXDispSwap_VertexAttrib4NbvARB},
-    /* [ 356] =  4236 */ {__glXDisp_VertexAttrib4NsvARB,
-                          __glXDispSwap_VertexAttrib4NsvARB},
-    /* [ 357] =  4237 */ {__glXDisp_VertexAttrib4NivARB,
-                          __glXDispSwap_VertexAttrib4NivARB},
-    /* [ 358] =  4238 */ {__glXDisp_VertexAttrib4NusvARB,
-                          __glXDispSwap_VertexAttrib4NusvARB},
-    /* [ 359] =  4239 */ {__glXDisp_VertexAttrib4NuivARB,
-                          __glXDispSwap_VertexAttrib4NuivARB},
-    /* [ 360] =  4320 */ {__glXDisp_DeleteFramebuffersEXT,
-                          __glXDispSwap_DeleteFramebuffersEXT},
-    /* [ 361] =  4321 */ {__glXDisp_FramebufferTexture1DEXT,
-                          __glXDispSwap_FramebufferTexture1DEXT},
-    /* [ 362] =  4322 */ {__glXDisp_FramebufferTexture2DEXT,
-                          __glXDispSwap_FramebufferTexture2DEXT},
-    /* [ 363] =  4323 */ {__glXDisp_FramebufferTexture3DEXT,
-                          __glXDispSwap_FramebufferTexture3DEXT},
-    /* [ 364] =  4324 */ {__glXDisp_FramebufferRenderbufferEXT,
-                          __glXDispSwap_FramebufferRenderbufferEXT},
-    /* [ 365] =  4325 */ {__glXDisp_GenerateMipmapEXT,
-                          __glXDispSwap_GenerateMipmapEXT},
+    /* [ 350] =  4230 */ {__glXDisp_VertexAttrib4bv,
+                          __glXDispSwap_VertexAttrib4bv},
+    /* [ 351] =  4231 */ {__glXDisp_VertexAttrib4iv,
+                          __glXDispSwap_VertexAttrib4iv},
+    /* [ 352] =  4232 */ {__glXDisp_VertexAttrib4ubv,
+                          __glXDispSwap_VertexAttrib4ubv},
+    /* [ 353] =  4233 */ {__glXDisp_VertexAttrib4usv,
+                          __glXDispSwap_VertexAttrib4usv},
+    /* [ 354] =  4234 */ {__glXDisp_VertexAttrib4uiv,
+                          __glXDispSwap_VertexAttrib4uiv},
+    /* [ 355] =  4235 */ {__glXDisp_VertexAttrib4Nbv,
+                          __glXDispSwap_VertexAttrib4Nbv},
+    /* [ 356] =  4236 */ {__glXDisp_VertexAttrib4Nsv,
+                          __glXDispSwap_VertexAttrib4Nsv},
+    /* [ 357] =  4237 */ {__glXDisp_VertexAttrib4Niv,
+                          __glXDispSwap_VertexAttrib4Niv},
+    /* [ 358] =  4238 */ {__glXDisp_VertexAttrib4Nusv,
+                          __glXDispSwap_VertexAttrib4Nusv},
+    /* [ 359] =  4239 */ {__glXDisp_VertexAttrib4Nuiv,
+                          __glXDispSwap_VertexAttrib4Nuiv},
+    /* [ 360] =  4320 */ {__glXDisp_DeleteFramebuffers,
+                          __glXDispSwap_DeleteFramebuffers},
+    /* [ 361] =  4321 */ {__glXDisp_FramebufferTexture1D,
+                          __glXDispSwap_FramebufferTexture1D},
+    /* [ 362] =  4322 */ {__glXDisp_FramebufferTexture2D,
+                          __glXDispSwap_FramebufferTexture2D},
+    /* [ 363] =  4323 */ {__glXDisp_FramebufferTexture3D,
+                          __glXDispSwap_FramebufferTexture3D},
+    /* [ 364] =  4324 */ {__glXDisp_FramebufferRenderbuffer,
+                          __glXDispSwap_FramebufferRenderbuffer},
+    /* [ 365] =  4325 */ {__glXDisp_GenerateMipmap,
+                          __glXDispSwap_GenerateMipmap},
     /* [ 366] =  4326 */ {NULL, NULL},
     /* [ 367] =  4327 */ {NULL, NULL},
     /* [ 368] =  4328 */ {NULL, NULL},
     /* [ 369] =  4329 */ {NULL, NULL},
-    /* [ 370] =  4330 */ {__glXDisp_BlitFramebufferEXT,
-                          __glXDispSwap_BlitFramebufferEXT},
+    /* [ 370] =  4330 */ {__glXDisp_BlitFramebuffer,
+                          __glXDispSwap_BlitFramebuffer},
     /* [ 371] =  4331 */ {__glXDisp_RenderbufferStorageMultisample,
                           __glXDispSwap_RenderbufferStorageMultisample},
     /* [ 372] =  4332 */ {NULL, NULL},
     /* [ 373] =  4333 */ {NULL, NULL},
     /* [ 374] =  4334 */ {NULL, NULL},
     /* [ 375] =  4335 */ {NULL, NULL},
-    /* [ 376] =  4128 */ {__glXDisp_SecondaryColor3ivEXT,
-                          __glXDispSwap_SecondaryColor3ivEXT},
+    /* [ 376] =  4128 */ {__glXDisp_SecondaryColor3iv,
+                          __glXDispSwap_SecondaryColor3iv},
     /* [ 377] =  4129 */ {__glXDisp_SecondaryColor3fvEXT,
                           __glXDispSwap_SecondaryColor3fvEXT},
-    /* [ 378] =  4130 */ {__glXDisp_SecondaryColor3dvEXT,
-                          __glXDispSwap_SecondaryColor3dvEXT},
-    /* [ 379] =  4131 */ {__glXDisp_SecondaryColor3ubvEXT,
-                          __glXDispSwap_SecondaryColor3ubvEXT},
-    /* [ 380] =  4132 */ {__glXDisp_SecondaryColor3usvEXT,
-                          __glXDispSwap_SecondaryColor3usvEXT},
-    /* [ 381] =  4133 */ {__glXDisp_SecondaryColor3uivEXT,
-                          __glXDispSwap_SecondaryColor3uivEXT},
-    /* [ 382] =  4134 */ {__glXDisp_BlendFuncSeparateEXT,
-                          __glXDispSwap_BlendFuncSeparateEXT},
+    /* [ 378] =  4130 */ {__glXDisp_SecondaryColor3dv,
+                          __glXDispSwap_SecondaryColor3dv},
+    /* [ 379] =  4131 */ {__glXDisp_SecondaryColor3ubv,
+                          __glXDispSwap_SecondaryColor3ubv},
+    /* [ 380] =  4132 */ {__glXDisp_SecondaryColor3usv,
+                          __glXDispSwap_SecondaryColor3usv},
+    /* [ 381] =  4133 */ {__glXDisp_SecondaryColor3uiv,
+                          __glXDispSwap_SecondaryColor3uiv},
+    /* [ 382] =  4134 */ {__glXDisp_BlendFuncSeparate,
+                          __glXDispSwap_BlendFuncSeparate},
     /* [ 383] =  4135 */ {NULL, NULL},
     /* [ 384] =  4264 */ {NULL, NULL},
     /* [ 385] =  4265 */ {__glXDisp_VertexAttrib1svNV,
@@ -914,14 +903,14 @@ static const void *Render_function_table[408][2] = {
     /* [ 401] =  4313 */ {NULL, NULL},
     /* [ 402] =  4314 */ {NULL, NULL},
     /* [ 403] =  4315 */ {NULL, NULL},
-    /* [ 404] =  4316 */ {__glXDisp_BindRenderbufferEXT,
-                          __glXDispSwap_BindRenderbufferEXT},
-    /* [ 405] =  4317 */ {__glXDisp_DeleteRenderbuffersEXT,
-                          __glXDispSwap_DeleteRenderbuffersEXT},
-    /* [ 406] =  4318 */ {__glXDisp_RenderbufferStorageEXT,
-                          __glXDispSwap_RenderbufferStorageEXT},
-    /* [ 407] =  4319 */ {__glXDisp_BindFramebufferEXT,
-                          __glXDispSwap_BindFramebufferEXT},
+    /* [ 404] =  4316 */ {__glXDisp_BindRenderbuffer,
+                          __glXDispSwap_BindRenderbuffer},
+    /* [ 405] =  4317 */ {__glXDisp_DeleteRenderbuffers,
+                          __glXDispSwap_DeleteRenderbuffers},
+    /* [ 406] =  4318 */ {__glXDisp_RenderbufferStorage,
+                          __glXDispSwap_RenderbufferStorage},
+    /* [ 407] =  4319 */ {__glXDisp_BindFramebuffer,
+                          __glXDispSwap_BindFramebuffer},
 };
 
 static const int_fast16_t Render_size_table[408][2] = {
@@ -1165,8 +1154,8 @@ static const int_fast16_t Render_size_table[408][2] = {
     /* [237] =   237 */ {24, ~0},
     /* [238] =   238 */ {0, ~0},
     /* [239] =   239 */ {0, ~0},
-    /* [240] =  2048 */ {12, ~0},
-    /* [241] =  2049 */ {8, ~0},
+    /* [240] =  2048 */ {0, ~0},
+    /* [241] =  2049 */ {0, ~0},
     /* [242] =  2050 */ {0, ~0},
     /* [243] =  2051 */ {0, ~0},
     /* [244] =  2052 */ {0, ~0},
@@ -1226,14 +1215,14 @@ static const int_fast16_t Render_size_table[408][2] = {
     /* [298] =  4178 */ {0, ~0},
     /* [299] =  4179 */ {0, ~0},
     /* [300] =  4180 */ {12, ~0},
-    /* [301] =  4181 */ {28, ~0},
-    /* [302] =  4182 */ {8, 51},
-    /* [303] =  4183 */ {16, 52},
+    /* [301] =  4181 */ {0, ~0},
+    /* [302] =  4182 */ {0, ~0},
+    /* [303] =  4183 */ {0, ~0},
     /* [304] =  4184 */ {28, ~0},
     /* [305] =  4185 */ {44, ~0},
-    /* [306] =  4186 */ {16, 53},
-    /* [307] =  4187 */ {16, 54},
-    /* [308] =  4188 */ {20, ~0},
+    /* [306] =  4186 */ {0, ~0},
+    /* [307] =  4187 */ {0, ~0},
+    /* [308] =  4188 */ {0, ~0},
     /* [309] =  4189 */ {12, ~0},
     /* [310] =  4190 */ {12, ~0},
     /* [311] =  4191 */ {16, ~0},
@@ -1247,27 +1236,27 @@ static const int_fast16_t Render_size_table[408][2] = {
     /* [319] =  4199 */ {32, ~0},
     /* [320] =  4200 */ {40, ~0},
     /* [321] =  4201 */ {12, ~0},
-    /* [322] =  4202 */ {12, 55},
-    /* [323] =  4203 */ {12, 56},
-    /* [324] =  4204 */ {12, 57},
-    /* [325] =  4205 */ {12, 58},
-    /* [326] =  4206 */ {12, 59},
-    /* [327] =  4207 */ {12, 60},
-    /* [328] =  4208 */ {12, 61},
-    /* [329] =  4209 */ {12, 62},
-    /* [330] =  4210 */ {12, 63},
-    /* [331] =  4211 */ {12, 64},
-    /* [332] =  4212 */ {12, 65},
-    /* [333] =  4213 */ {12, 66},
-    /* [334] =  4214 */ {12, 67},
+    /* [322] =  4202 */ {12, 51},
+    /* [323] =  4203 */ {12, 52},
+    /* [324] =  4204 */ {12, 53},
+    /* [325] =  4205 */ {12, 54},
+    /* [326] =  4206 */ {12, 55},
+    /* [327] =  4207 */ {12, 56},
+    /* [328] =  4208 */ {12, 57},
+    /* [329] =  4209 */ {12, 58},
+    /* [330] =  4210 */ {12, 59},
+    /* [331] =  4211 */ {12, 60},
+    /* [332] =  4212 */ {12, 61},
+    /* [333] =  4213 */ {12, 62},
+    /* [334] =  4214 */ {12, 63},
     /* [335] =  4215 */ {28, ~0},
     /* [336] =  4216 */ {44, ~0},
-    /* [337] =  4217 */ {16, 68},
-    /* [338] =  4218 */ {28, 69},
-    /* [339] =  4219 */ {44, 70},
+    /* [337] =  4217 */ {16, 64},
+    /* [338] =  4218 */ {0, ~0},
+    /* [339] =  4219 */ {0, ~0},
     /* [340] =  4220 */ {8, ~0},
     /* [341] =  4221 */ {12, ~0},
-    /* [342] =  4222 */ {8, 71},
+    /* [342] =  4222 */ {8, 65},
     /* [343] =  4223 */ {0, ~0},
     /* [344] =  4224 */ {0, ~0},
     /* [345] =  4225 */ {0, ~0},
@@ -1285,7 +1274,7 @@ static const int_fast16_t Render_size_table[408][2] = {
     /* [357] =  4237 */ {24, ~0},
     /* [358] =  4238 */ {16, ~0},
     /* [359] =  4239 */ {24, ~0},
-    /* [360] =  4320 */ {8, 72},
+    /* [360] =  4320 */ {8, 66},
     /* [361] =  4321 */ {24, ~0},
     /* [362] =  4322 */ {24, ~0},
     /* [363] =  4323 */ {28, ~0},
@@ -1330,12 +1319,12 @@ static const int_fast16_t Render_size_table[408][2] = {
     /* [402] =  4314 */ {0, ~0},
     /* [403] =  4315 */ {0, ~0},
     /* [404] =  4316 */ {12, ~0},
-    /* [405] =  4317 */ {8, 73},
+    /* [405] =  4317 */ {8, 67},
     /* [406] =  4318 */ {20, ~0},
     /* [407] =  4319 */ {12, ~0},
 };
 
-static const gl_proto_size_func Render_size_func_table[74] = {
+static const gl_proto_size_func Render_size_func_table[68] = {
     __glXCallListsReqSize,
     __glXBitmapReqSize,
     __glXFogfvReqSize,
@@ -1366,17 +1355,17 @@ static const gl_proto_size_func Render_size_func_table[74] = {
     __glXDrawPixelsReqSize,
     __glXDrawArraysReqSize,
     __glXColorSubTableReqSize,
-    __glXCompressedTexImage1DARBReqSize,
-    __glXCompressedTexImage2DARBReqSize,
-    __glXCompressedTexImage3DARBReqSize,
-    __glXCompressedTexSubImage1DARBReqSize,
-    __glXCompressedTexSubImage2DARBReqSize,
-    __glXCompressedTexSubImage3DARBReqSize,
-    __glXDrawBuffersARBReqSize,
+    __glXCompressedTexImage1DReqSize,
+    __glXCompressedTexImage2DReqSize,
+    __glXCompressedTexImage3DReqSize,
+    __glXCompressedTexSubImage1DReqSize,
+    __glXCompressedTexSubImage2DReqSize,
+    __glXCompressedTexSubImage3DReqSize,
+    __glXDrawBuffersReqSize,
     __glXColorTableReqSize,
     __glXColorTableParameterfvReqSize,
     __glXColorTableParameterivReqSize,
-    __glXPointParameterfvEXTReqSize,
+    __glXPointParameterfvReqSize,
     __glXTexSubImage1DReqSize,
     __glXTexSubImage2DReqSize,
     __glXConvolutionFilter1DReqSize,
@@ -1387,10 +1376,6 @@ static const gl_proto_size_func Render_size_func_table[74] = {
     __glXTexImage3DReqSize,
     __glXTexSubImage3DReqSize,
     __glXPrioritizeTexturesReqSize,
-    __glXRequestResidentProgramsNVReqSize,
-    __glXLoadProgramNVReqSize,
-    __glXProgramParameters4fvNVReqSize,
-    __glXProgramParameters4dvNVReqSize,
     __glXVertexAttribs1svNVReqSize,
     __glXVertexAttribs2svNVReqSize,
     __glXVertexAttribs3svNVReqSize,
@@ -1405,11 +1390,9 @@ static const gl_proto_size_func Render_size_func_table[74] = {
     __glXVertexAttribs4dvNVReqSize,
     __glXVertexAttribs4ubvNVReqSize,
     __glXProgramStringARBReqSize,
-    __glXProgramNamedParameter4fvNVReqSize,
-    __glXProgramNamedParameter4dvNVReqSize,
-    __glXPointParameterivNVReqSize,
-    __glXDeleteFramebuffersEXTReqSize,
-    __glXDeleteRenderbuffersEXTReqSize,
+    __glXPointParameterivReqSize,
+    __glXDeleteFramebuffersReqSize,
+    __glXDeleteRenderbuffersReqSize,
 };
 
 const struct __glXDispatchInfo Render_dispatch_info = {
@@ -1711,19 +1694,13 @@ static const void *VendorPriv_function_table[104][2] = {
                          __glXDispSwap_GetProgramEnvParameterfvARB},
     /* [ 25] =  1297 */ {__glXDisp_GetProgramEnvParameterdvARB,
                          __glXDispSwap_GetProgramEnvParameterdvARB},
-    /* [ 26] =  1298 */ {__glXDisp_GetProgramivNV,
-                         __glXDispSwap_GetProgramivNV},
-    /* [ 27] =  1299 */ {__glXDisp_GetProgramStringNV,
-                         __glXDispSwap_GetProgramStringNV},
-    /* [ 28] =  1300 */ {__glXDisp_GetTrackMatrixivNV,
-                         __glXDispSwap_GetTrackMatrixivNV},
-    /* [ 29] =  1301 */ {__glXDisp_GetVertexAttribdvARB,
-                         __glXDispSwap_GetVertexAttribdvARB},
-    /* [ 30] =  1302 */ {__glXDisp_GetVertexAttribfvARB,
-                         __glXDispSwap_GetVertexAttribfvARB},
-    /* [ 31] =  1303 */ {__glXDisp_GetVertexAttribivNV,
-                         __glXDispSwap_GetVertexAttribivNV},
-    /* [ 32] =  1304 */ {__glXDisp_IsProgramNV, __glXDispSwap_IsProgramNV},
+    /* [ 26] =  1298 */ {NULL, NULL},
+    /* [ 27] =  1299 */ {NULL, NULL},
+    /* [ 28] =  1300 */ {NULL, NULL},
+    /* [ 29] =  1301 */ {NULL, NULL},
+    /* [ 30] =  1302 */ {NULL, NULL},
+    /* [ 31] =  1303 */ {NULL, NULL},
+    /* [ 32] =  1304 */ {__glXDisp_IsProgramARB, __glXDispSwap_IsProgramARB},
     /* [ 33] =  1305 */ {__glXDisp_GetProgramLocalParameterfvARB,
                          __glXDispSwap_GetProgramLocalParameterfvARB},
     /* [ 34] =  1306 */ {__glXDisp_GetProgramLocalParameterdvARB,
@@ -1733,20 +1710,18 @@ static const void *VendorPriv_function_table[104][2] = {
     /* [ 36] =  1308 */ {__glXDisp_GetProgramStringARB,
                          __glXDispSwap_GetProgramStringARB},
     /* [ 37] =  1309 */ {NULL, NULL},
-    /* [ 38] =  1310 */ {__glXDisp_GetProgramNamedParameterfvNV,
-                         __glXDispSwap_GetProgramNamedParameterfvNV},
-    /* [ 39] =  1311 */ {__glXDisp_GetProgramNamedParameterdvNV,
-                         __glXDispSwap_GetProgramNamedParameterdvNV},
+    /* [ 38] =  1310 */ {NULL, NULL},
+    /* [ 39] =  1311 */ {NULL, NULL},
     /* [ 40] =  1288 */ {NULL, NULL},
     /* [ 41] =  1289 */ {NULL, NULL},
     /* [ 42] =  1290 */ {NULL, NULL},
     /* [ 43] =  1291 */ {NULL, NULL},
     /* [ 44] =  1292 */ {NULL, NULL},
-    /* [ 45] =  1293 */ {__glXDisp_AreProgramsResidentNV,
-                         __glXDispSwap_AreProgramsResidentNV},
-    /* [ 46] =  1294 */ {__glXDisp_DeleteProgramsNV,
-                         __glXDispSwap_DeleteProgramsNV},
-    /* [ 47] =  1295 */ {__glXDisp_GenProgramsNV, __glXDispSwap_GenProgramsNV},
+    /* [ 45] =  1293 */ {NULL, NULL},
+    /* [ 46] =  1294 */ {__glXDisp_DeleteProgramsARB,
+                         __glXDispSwap_DeleteProgramsARB},
+    /* [ 47] =  1295 */ {__glXDisp_GenProgramsARB,
+                         __glXDispSwap_GenProgramsARB},
     /* [ 48] =  1328 */ {NULL, NULL},
     /* [ 49] =  1329 */ {NULL, NULL},
     /* [ 50] =  1330 */ {__glXDisp_BindTexImageEXT,
@@ -1763,20 +1738,19 @@ static const void *VendorPriv_function_table[104][2] = {
     /* [ 59] =  1419 */ {NULL, NULL},
     /* [ 60] =  1420 */ {NULL, NULL},
     /* [ 61] =  1421 */ {NULL, NULL},
-    /* [ 62] =  1422 */ {__glXDisp_IsRenderbufferEXT,
-                         __glXDispSwap_IsRenderbufferEXT},
-    /* [ 63] =  1423 */ {__glXDisp_GenRenderbuffersEXT,
-                         __glXDispSwap_GenRenderbuffersEXT},
-    /* [ 64] =  1424 */ {__glXDisp_GetRenderbufferParameterivEXT,
-                         __glXDispSwap_GetRenderbufferParameterivEXT},
-    /* [ 65] =  1425 */ {__glXDisp_IsFramebufferEXT,
-                         __glXDispSwap_IsFramebufferEXT},
-    /* [ 66] =  1426 */ {__glXDisp_GenFramebuffersEXT,
-                         __glXDispSwap_GenFramebuffersEXT},
-    /* [ 67] =  1427 */ {__glXDisp_CheckFramebufferStatusEXT,
-                         __glXDispSwap_CheckFramebufferStatusEXT},
-    /* [ 68] =  1428 */ {__glXDisp_GetFramebufferAttachmentParameterivEXT,
-                         __glXDispSwap_GetFramebufferAttachmentParameterivEXT},
+    /* [ 62] =  1422 */ {__glXDisp_IsRenderbuffer,
+                         __glXDispSwap_IsRenderbuffer},
+    /* [ 63] =  1423 */ {__glXDisp_GenRenderbuffers,
+                         __glXDispSwap_GenRenderbuffers},
+    /* [ 64] =  1424 */ {__glXDisp_GetRenderbufferParameteriv,
+                         __glXDispSwap_GetRenderbufferParameteriv},
+    /* [ 65] =  1425 */ {__glXDisp_IsFramebuffer, __glXDispSwap_IsFramebuffer},
+    /* [ 66] =  1426 */ {__glXDisp_GenFramebuffers,
+                         __glXDispSwap_GenFramebuffers},
+    /* [ 67] =  1427 */ {__glXDisp_CheckFramebufferStatus,
+                         __glXDispSwap_CheckFramebufferStatus},
+    /* [ 68] =  1428 */ {__glXDisp_GetFramebufferAttachmentParameteriv,
+                         __glXDispSwap_GetFramebufferAttachmentParameteriv},
     /* [ 69] =  1429 */ {NULL, NULL},
     /* [ 70] =  1430 */ {NULL, NULL},
     /* [ 71] =  1431 */ {NULL, NULL},
diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c
index 5c2d06b42..94de47dd6 100644
--- a/xorg-server/glx/indirect_texture_compression.c
+++ b/xorg-server/glx/indirect_texture_compression.c
@@ -34,13 +34,9 @@
 #include "unpack.h"
 #include "indirect_size_get.h"
 #include "indirect_dispatch.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 int
-__glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc)
+__glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc)
 {
     xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
@@ -54,16 +50,13 @@ __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc)
         GLint compsize = 0;
         char *answer = NULL, answerBuffer[200];
 
-        CALL_GetTexLevelParameteriv(GET_DISPATCH(),
-                                    (target, level,
-                                     GL_TEXTURE_COMPRESSED_IMAGE_SIZE,
-                                     &compsize));
+        glGetTexLevelParameteriv(target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE,
+                                 &compsize);
 
         if (compsize != 0) {
             __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
             __glXClearErrorOccured();
-            CALL_GetCompressedTexImageARB(GET_DISPATCH(),
-                                          (target, level, answer));
+            glGetCompressedTexImageARB(target, level, answer);
         }
 
         if (__glXErrorOccured()) {
@@ -84,8 +77,7 @@ __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl,
-                                       GLbyte * pc)
+__glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc)
 {
     xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
@@ -100,16 +92,13 @@ __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl,
         GLint compsize = 0;
         char *answer = NULL, answerBuffer[200];
 
-        CALL_GetTexLevelParameteriv(GET_DISPATCH(),
-                                    (target, level,
-                                     GL_TEXTURE_COMPRESSED_IMAGE_SIZE,
-                                     &compsize));
+        glGetTexLevelParameteriv(target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE,
+                                 &compsize);
 
         if (compsize != 0) {
             __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
             __glXClearErrorOccured();
-            CALL_GetCompressedTexImageARB(GET_DISPATCH(),
-                                          (target, level, answer));
+            glGetCompressedTexImageARB(target, level, answer);
         }
 
         if (__glXErrorOccured()) {
diff --git a/xorg-server/glx/indirect_util.c b/xorg-server/glx/indirect_util.c
index a30b1f880..f9d1243b1 100644
--- a/xorg-server/glx/indirect_util.c
+++ b/xorg-server/glx/indirect_util.c
@@ -39,10 +39,6 @@
 #include "glxserver.h"
 #include "glxbyteorder.h"
 #include "singlesize.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 #include "glxext.h"
 #include "indirect_table.h"
 #include "indirect_util.h"
@@ -57,8 +53,7 @@ __glGetBooleanv_variable_size(GLenum e)
     if (e == GL_COMPRESSED_TEXTURE_FORMATS) {
         GLint temp;
 
-        CALL_GetIntegerv(GET_DISPATCH(),
-                         (GL_NUM_COMPRESSED_TEXTURE_FORMATS, &temp));
+        glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &temp);
         return temp;
     }
     else {
diff --git a/xorg-server/glx/render2.c b/xorg-server/glx/render2.c
index 8cf74a691..5a2f4827e 100644
--- a/xorg-server/glx/render2.c
+++ b/xorg-server/glx/render2.c
@@ -36,10 +36,6 @@
 #include "unpack.h"
 #include "indirect_size.h"
 #include "indirect_dispatch.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 void
 __glXDisp_Map1f(GLbyte * pc)
@@ -55,7 +51,7 @@ __glXDisp_Map1f(GLbyte * pc)
     points = (GLfloat *) (pc + 16);
     k = __glMap1f_size(target);
 
-    CALL_Map1f(GET_DISPATCH(), (target, u1, u2, k, order, points));
+    glMap1f(target, u1, u2, k, order, points);
 }
 
 void
@@ -78,9 +74,7 @@ __glXDisp_Map2f(GLbyte * pc)
     ustride = vorder * k;
     vstride = k;
 
-    CALL_Map2f(GET_DISPATCH(),
-               (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder,
-                points));
+    glMap2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 void
@@ -126,7 +120,7 @@ __glXDisp_Map1d(GLbyte * pc)
 #else
     points = (GLdouble *) pc;
 #endif
-    CALL_Map1d(GET_DISPATCH(), (target, u1, u2, k, order, points));
+    glMap1d(target, u1, u2, k, order, points);
 }
 
 void
@@ -178,9 +172,7 @@ __glXDisp_Map2d(GLbyte * pc)
 #else
     points = (GLdouble *) pc;
 #endif
-    CALL_Map2d(GET_DISPATCH(),
-               (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder,
-                points));
+    glMap2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 void
@@ -215,39 +207,36 @@ __glXDisp_DrawArrays(GLbyte * pc)
 
         switch (component) {
         case GL_VERTEX_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_VERTEX_ARRAY));
-            CALL_VertexPointer(GET_DISPATCH(), (numVals, datatype, stride, pc));
+            glEnableClientState(GL_VERTEX_ARRAY);
+            glVertexPointer(numVals, datatype, stride, pc);
             break;
         case GL_NORMAL_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_NORMAL_ARRAY));
-            CALL_NormalPointer(GET_DISPATCH(), (datatype, stride, pc));
+            glEnableClientState(GL_NORMAL_ARRAY);
+            glNormalPointer(datatype, stride, pc);
             break;
         case GL_COLOR_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_COLOR_ARRAY));
-            CALL_ColorPointer(GET_DISPATCH(), (numVals, datatype, stride, pc));
+            glEnableClientState(GL_COLOR_ARRAY);
+            glColorPointer(numVals, datatype, stride, pc);
             break;
         case GL_INDEX_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_INDEX_ARRAY));
-            CALL_IndexPointer(GET_DISPATCH(), (datatype, stride, pc));
+            glEnableClientState(GL_INDEX_ARRAY);
+            glIndexPointer(datatype, stride, pc);
             break;
         case GL_TEXTURE_COORD_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_TEXTURE_COORD_ARRAY));
-            CALL_TexCoordPointer(GET_DISPATCH(),
-                                 (numVals, datatype, stride, pc));
+            glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+            glTexCoordPointer(numVals, datatype, stride, pc);
             break;
         case GL_EDGE_FLAG_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_EDGE_FLAG_ARRAY));
-            CALL_EdgeFlagPointer(GET_DISPATCH(),
-                                 (stride, (const GLboolean *) pc));
+            glEnableClientState(GL_EDGE_FLAG_ARRAY);
+            glEdgeFlagPointer(stride, (const GLboolean *) pc);
             break;
         case GL_SECONDARY_COLOR_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY));
-            CALL_SecondaryColorPointerEXT(GET_DISPATCH(),
-                                          (numVals, datatype, stride, pc));
+            glEnableClientState(GL_SECONDARY_COLOR_ARRAY);
+            glSecondaryColorPointerEXT(numVals, datatype, stride, pc);
             break;
         case GL_FOG_COORD_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY));
-            CALL_FogCoordPointerEXT(GET_DISPATCH(), (datatype, stride, pc));
+            glEnableClientState(GL_FOG_COORD_ARRAY);
+            glFogCoordPointerEXT(datatype, stride, pc);
             break;
         default:
             break;
@@ -256,15 +245,15 @@ __glXDisp_DrawArrays(GLbyte * pc)
         pc += __GLX_PAD(numVals * __glXTypeSize(datatype));
     }
 
-    CALL_DrawArrays(GET_DISPATCH(), (primType, 0, numVertexes));
+    glDrawArrays(primType, 0, numVertexes);
 
     /* turn off anything we might have turned on */
-    CALL_DisableClientState(GET_DISPATCH(), (GL_VERTEX_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_NORMAL_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_COLOR_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_INDEX_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_TEXTURE_COORD_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_EDGE_FLAG_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY));
+    glDisableClientState(GL_VERTEX_ARRAY);
+    glDisableClientState(GL_NORMAL_ARRAY);
+    glDisableClientState(GL_COLOR_ARRAY);
+    glDisableClientState(GL_INDEX_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+    glDisableClientState(GL_EDGE_FLAG_ARRAY);
+    glDisableClientState(GL_SECONDARY_COLOR_ARRAY);
+    glDisableClientState(GL_FOG_COORD_ARRAY);
 }
diff --git a/xorg-server/glx/render2swap.c b/xorg-server/glx/render2swap.c
index 8b5d9daff..e6f73b896 100644
--- a/xorg-server/glx/render2swap.c
+++ b/xorg-server/glx/render2swap.c
@@ -36,10 +36,6 @@
 #include "unpack.h"
 #include "indirect_size.h"
 #include "indirect_dispatch.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 void
 __glXDispSwap_Map1f(GLbyte * pc)
@@ -73,7 +69,7 @@ __glXDispSwap_Map1f(GLbyte * pc)
     }
     __GLX_SWAP_FLOAT_ARRAY(points, compsize);
 
-    CALL_Map1f(GET_DISPATCH(), (target, u1, u2, k, order, points));
+    glMap1f(target, u1, u2, k, order, points);
 }
 
 void
@@ -117,9 +113,7 @@ __glXDispSwap_Map2f(GLbyte * pc)
     }
     __GLX_SWAP_FLOAT_ARRAY(points, compsize);
 
-    CALL_Map2f(GET_DISPATCH(),
-               (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder,
-                points));
+    glMap2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 void
@@ -167,7 +161,7 @@ __glXDispSwap_Map1d(GLbyte * pc)
 #else
     points = (GLdouble *) pc;
 #endif
-    CALL_Map1d(GET_DISPATCH(), (target, u1, u2, k, order, points));
+    glMap1d(target, u1, u2, k, order, points);
 }
 
 void
@@ -223,9 +217,7 @@ __glXDispSwap_Map2d(GLbyte * pc)
 #else
     points = (GLdouble *) pc;
 #endif
-    CALL_Map2d(GET_DISPATCH(),
-               (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder,
-                points));
+    glMap2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 static void
@@ -337,39 +329,36 @@ __glXDispSwap_DrawArrays(GLbyte * pc)
 
         switch (component) {
         case GL_VERTEX_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_VERTEX_ARRAY));
-            CALL_VertexPointer(GET_DISPATCH(), (numVals, datatype, stride, pc));
+            glEnableClientState(GL_VERTEX_ARRAY);
+            glVertexPointer(numVals, datatype, stride, pc);
             break;
         case GL_NORMAL_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_NORMAL_ARRAY));
-            CALL_NormalPointer(GET_DISPATCH(), (datatype, stride, pc));
+            glEnableClientState(GL_NORMAL_ARRAY);
+            glNormalPointer(datatype, stride, pc);
             break;
         case GL_COLOR_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_COLOR_ARRAY));
-            CALL_ColorPointer(GET_DISPATCH(), (numVals, datatype, stride, pc));
+            glEnableClientState(GL_COLOR_ARRAY);
+            glColorPointer(numVals, datatype, stride, pc);
             break;
         case GL_INDEX_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_INDEX_ARRAY));
-            CALL_IndexPointer(GET_DISPATCH(), (datatype, stride, pc));
+            glEnableClientState(GL_INDEX_ARRAY);
+            glIndexPointer(datatype, stride, pc);
             break;
         case GL_TEXTURE_COORD_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_TEXTURE_COORD_ARRAY));
-            CALL_TexCoordPointer(GET_DISPATCH(),
-                                 (numVals, datatype, stride, pc));
+            glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+            glTexCoordPointer(numVals, datatype, stride, pc);
             break;
         case GL_EDGE_FLAG_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_EDGE_FLAG_ARRAY));
-            CALL_EdgeFlagPointer(GET_DISPATCH(),
-                                 (stride, (const GLboolean *) pc));
+            glEnableClientState(GL_EDGE_FLAG_ARRAY);
+            glEdgeFlagPointer(stride, (const GLboolean *) pc);
             break;
         case GL_SECONDARY_COLOR_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY));
-            CALL_SecondaryColorPointerEXT(GET_DISPATCH(),
-                                          (numVals, datatype, stride, pc));
+            glEnableClientState(GL_SECONDARY_COLOR_ARRAY);
+            glSecondaryColorPointerEXT(numVals, datatype, stride, pc);
             break;
         case GL_FOG_COORD_ARRAY:
-            CALL_EnableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY));
-            CALL_FogCoordPointerEXT(GET_DISPATCH(), (datatype, stride, pc));
+            glEnableClientState(GL_FOG_COORD_ARRAY);
+            glFogCoordPointerEXT(datatype, stride, pc);
             break;
         default:
             break;
@@ -378,15 +367,15 @@ __glXDispSwap_DrawArrays(GLbyte * pc)
         pc += __GLX_PAD(numVals * __glXTypeSize(datatype));
     }
 
-    CALL_DrawArrays(GET_DISPATCH(), (primType, 0, numVertexes));
+    glDrawArrays(primType, 0, numVertexes);
 
     /* turn off anything we might have turned on */
-    CALL_DisableClientState(GET_DISPATCH(), (GL_VERTEX_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_NORMAL_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_COLOR_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_INDEX_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_TEXTURE_COORD_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_EDGE_FLAG_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY));
-    CALL_DisableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY));
+    glDisableClientState(GL_VERTEX_ARRAY);
+    glDisableClientState(GL_NORMAL_ARRAY);
+    glDisableClientState(GL_COLOR_ARRAY);
+    glDisableClientState(GL_INDEX_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+    glDisableClientState(GL_EDGE_FLAG_ARRAY);
+    glDisableClientState(GL_SECONDARY_COLOR_ARRAY);
+    glDisableClientState(GL_FOG_COORD_ARRAY);
 }
diff --git a/xorg-server/glx/renderpix.c b/xorg-server/glx/renderpix.c
index 6fccde61f..91ba91187 100644
--- a/xorg-server/glx/renderpix.c
+++ b/xorg-server/glx/renderpix.c
@@ -35,10 +35,6 @@
 #include "glxserver.h"
 #include "unpack.h"
 #include "indirect_dispatch.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 void
 __glXDisp_SeparableFilter2D(GLbyte * pc)
@@ -49,12 +45,12 @@ __glXDisp_SeparableFilter2D(GLbyte * pc)
 
     hdrlen = __GLX_PAD(__GLX_CONV_FILT_CMD_DISPATCH_HDR_SIZE);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH, hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ALIGNMENT, hdr->alignment));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
 
     /* XXX check this usage - internal code called
      ** a version without the packing parameters
@@ -64,10 +60,8 @@ __glXDisp_SeparableFilter2D(GLbyte * pc)
                                hdr->alignment);
     image1len = __GLX_PAD(image1len);
 
-    CALL_SeparableFilter2D(GET_DISPATCH(), (hdr->target, hdr->internalformat,
-                                            hdr->width, hdr->height,
-                                            hdr->format, hdr->type,
-                                            ((GLubyte *) hdr + hdrlen),
-                                            ((GLubyte *) hdr + hdrlen +
-                                             image1len)));
+    glSeparableFilter2D(hdr->target, hdr->internalformat, hdr->width,
+                        hdr->height, hdr->format, hdr->type,
+                        ((GLubyte *) hdr + hdrlen),
+                        ((GLubyte *) hdr + hdrlen + image1len));
 }
diff --git a/xorg-server/glx/renderpixswap.c b/xorg-server/glx/renderpixswap.c
index 24423cdef..a4cb246bb 100644
--- a/xorg-server/glx/renderpixswap.c
+++ b/xorg-server/glx/renderpixswap.c
@@ -35,10 +35,6 @@
 #include "glxserver.h"
 #include "unpack.h"
 #include "indirect_dispatch.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 void
 __glXDispSwap_SeparableFilter2D(GLbyte * pc)
@@ -67,12 +63,12 @@ __glXDispSwap_SeparableFilter2D(GLbyte * pc)
      ** Just invert swapBytes flag; the GL will figure out if it needs to swap
      ** the pixel data.
      */
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, !hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH, hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ALIGNMENT, hdr->alignment));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, !hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
 
     /* XXX check this usage - internal code called
      ** a version without the packing parameters
@@ -82,10 +78,8 @@ __glXDispSwap_SeparableFilter2D(GLbyte * pc)
                                hdr->alignment);
     image1len = __GLX_PAD(image1len);
 
-    CALL_SeparableFilter2D(GET_DISPATCH(), (hdr->target, hdr->internalformat,
-                                            hdr->width, hdr->height,
-                                            hdr->format, hdr->type,
-                                            ((GLubyte *) hdr + hdrlen),
-                                            ((GLubyte *) hdr + hdrlen +
-                                             image1len)));
+    glSeparableFilter2D(hdr->target, hdr->internalformat, hdr->width,
+                        hdr->height, hdr->format, hdr->type,
+                        ((GLubyte *) hdr + hdrlen),
+                        ((GLubyte *) hdr + hdrlen + image1len));
 }
diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c
index 9597d29fe..53b661d20 100644
--- a/xorg-server/glx/single2.c
+++ b/xorg-server/glx/single2.c
@@ -41,10 +41,6 @@
 #include "glxext.h"
 #include "indirect_dispatch.h"
 #include "unpack.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 int
 __glXDisp_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
@@ -72,7 +68,7 @@ __glXDisp_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
         }
         cx->feedbackBufSize = size;
     }
-    CALL_FeedbackBuffer(GET_DISPATCH(), (size, type, cx->feedbackBuf));
+    glFeedbackBuffer(size, type, cx->feedbackBuf);
     cx->hasUnflushedCommands = GL_TRUE;
     return Success;
 }
@@ -100,7 +96,7 @@ __glXDisp_SelectBuffer(__GLXclientState * cl, GLbyte * pc)
         }
         cx->selectBufSize = size;
     }
-    CALL_SelectBuffer(GET_DISPATCH(), (size, cx->selectBuf));
+    glSelectBuffer(size, cx->selectBuf);
     cx->hasUnflushedCommands = GL_TRUE;
     return Success;
 }
@@ -123,10 +119,10 @@ __glXDisp_RenderMode(__GLXclientState * cl, GLbyte * pc)
 
     pc += __GLX_SINGLE_HDR_SIZE;
     newMode = *(GLenum *) pc;
-    retval = CALL_RenderMode(GET_DISPATCH(), (newMode));
+    retval = glRenderMode(newMode);
 
     /* Check that render mode worked */
-    CALL_GetIntegerv(GET_DISPATCH(), (GL_RENDER_MODE, &newModeCheck));
+    glGetIntegerv(GL_RENDER_MODE, &newModeCheck);
     if (newModeCheck != newMode) {
         /* Render mode change failed.  Bail */
         newMode = newModeCheck;
@@ -219,7 +215,7 @@ __glXDisp_Flush(__GLXclientState * cl, GLbyte * pc)
         return error;
     }
 
-    CALL_Flush(GET_DISPATCH(), ());
+    glFlush();
     cx->hasUnflushedCommands = GL_FALSE;
     return Success;
 }
@@ -237,7 +233,7 @@ __glXDisp_Finish(__GLXclientState * cl, GLbyte * pc)
     }
 
     /* Do a local glFinish */
-    CALL_Finish(GET_DISPATCH(), ());
+    glFinish();
     cx->hasUnflushedCommands = GL_FALSE;
 
     /* Send empty reply packet to indicate finish is finished */
@@ -346,7 +342,7 @@ DoGetString(__GLXclientState * cl, GLbyte * pc, GLboolean need_swap)
 
     pc += __GLX_SINGLE_HDR_SIZE;
     name = *(GLenum *) (pc + 0);
-    string = (const char *) CALL_GetString(GET_DISPATCH(), (name));
+    string = (const char *) glGetString(name);
     client = cl->client;
 
     if (string == NULL)
diff --git a/xorg-server/glx/single2swap.c b/xorg-server/glx/single2swap.c
index 1ca532836..764501f59 100644
--- a/xorg-server/glx/single2swap.c
+++ b/xorg-server/glx/single2swap.c
@@ -37,10 +37,6 @@
 #include "glxext.h"
 #include "indirect_dispatch.h"
 #include "unpack.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 int
 __glXDispSwap_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
@@ -73,7 +69,7 @@ __glXDispSwap_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
         }
         cx->feedbackBufSize = size;
     }
-    CALL_FeedbackBuffer(GET_DISPATCH(), (size, type, cx->feedbackBuf));
+    glFeedbackBuffer(size, type, cx->feedbackBuf);
     cx->hasUnflushedCommands = GL_TRUE;
     return Success;
 }
@@ -105,7 +101,7 @@ __glXDispSwap_SelectBuffer(__GLXclientState * cl, GLbyte * pc)
         }
         cx->selectBufSize = size;
     }
-    CALL_SelectBuffer(GET_DISPATCH(), (size, cx->selectBuf));
+    glSelectBuffer(size, cx->selectBuf);
     cx->hasUnflushedCommands = GL_TRUE;
     return Success;
 }
@@ -133,10 +129,10 @@ __glXDispSwap_RenderMode(__GLXclientState * cl, GLbyte * pc)
     pc += __GLX_SINGLE_HDR_SIZE;
     __GLX_SWAP_INT(pc);
     newMode = *(GLenum *) pc;
-    retval = CALL_RenderMode(GET_DISPATCH(), (newMode));
+    retval = glRenderMode(newMode);
 
     /* Check that render mode worked */
-    CALL_GetIntegerv(GET_DISPATCH(), (GL_RENDER_MODE, &newModeCheck));
+    glGetIntegerv(GL_RENDER_MODE, &newModeCheck);
     if (newModeCheck != newMode) {
         /* Render mode change failed.  Bail */
         newMode = newModeCheck;
@@ -239,7 +235,7 @@ __glXDispSwap_Flush(__GLXclientState * cl, GLbyte * pc)
         return error;
     }
 
-    CALL_Flush(GET_DISPATCH(), ());
+    glFlush();
     cx->hasUnflushedCommands = GL_FALSE;
     return Success;
 }
@@ -260,7 +256,7 @@ __glXDispSwap_Finish(__GLXclientState * cl, GLbyte * pc)
     }
 
     /* Do a local glFinish */
-    CALL_Finish(GET_DISPATCH(), ());
+    glFinish();
     cx->hasUnflushedCommands = GL_FALSE;
 
     /* Send empty reply packet to indicate finish is finished */
diff --git a/xorg-server/glx/singlepix.c b/xorg-server/glx/singlepix.c
index fb6868d2d..506fdaad5 100644
--- a/xorg-server/glx/singlepix.c
+++ b/xorg-server/glx/singlepix.c
@@ -38,10 +38,6 @@
 #include "unpack.h"
 #include "indirect_size_get.h"
 #include "indirect_dispatch.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 int
 __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc)
@@ -71,16 +67,13 @@ __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_LSB_FIRST, lsbFirst));
+    glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
+    glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_ReadPixels(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                     *(GLint *) (pc + 4),
-                                     *(GLsizei *) (pc + 8),
-                                     *(GLsizei *) (pc + 12),
-                                     *(GLenum *) (pc + 16),
-                                     *(GLenum *) (pc + 20), answer));
+    glReadPixels(*(GLint *) (pc + 0), *(GLint *) (pc + 4),
+                 *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12),
+                 *(GLenum *) (pc + 16), *(GLenum *) (pc + 20), answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -119,13 +112,10 @@ __glXDisp_GetTexImage(__GLXclientState * cl, GLbyte * pc)
     target = *(GLenum *) (pc + 0);
     swapBytes = *(GLboolean *) (pc + 16);
 
-    CALL_GetTexLevelParameteriv(GET_DISPATCH(),
-                                (target, level, GL_TEXTURE_WIDTH, &width));
-    CALL_GetTexLevelParameteriv(GET_DISPATCH(),
-                                (target, level, GL_TEXTURE_HEIGHT, &height));
+    glGetTexLevelParameteriv(target, level, GL_TEXTURE_WIDTH, &width);
+    glGetTexLevelParameteriv(target, level, GL_TEXTURE_HEIGHT, &height);
     if (target == GL_TEXTURE_3D) {
-        CALL_GetTexLevelParameteriv(GET_DISPATCH(),
-                                    (target, level, GL_TEXTURE_DEPTH, &depth));
+        glGetTexLevelParameteriv(target, level, GL_TEXTURE_DEPTH, &depth);
     }
     /*
      * The three queries above might fail if we're in a state where queries
@@ -136,13 +126,11 @@ __glXDisp_GetTexImage(__GLXclientState * cl, GLbyte * pc)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetTexImage(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                      *(GLint *) (pc + 4),
-                                      *(GLenum *) (pc + 8),
-                                      *(GLenum *) (pc + 12), answer));
+    glGetTexImage(*(GLenum *) (pc + 0), *(GLint *) (pc + 4),
+                  *(GLenum *) (pc + 8), *(GLenum *) (pc + 12), answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -177,11 +165,11 @@ __glXDisp_GetPolygonStipple(__GLXclientState * cl, GLbyte * pc)
     pc += __GLX_SINGLE_HDR_SIZE;
     lsbFirst = *(GLboolean *) (pc + 0);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_LSB_FIRST, lsbFirst));
+    glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
     __GLX_GET_ANSWER_BUFFER(answer, cl, 128, 1);
 
     __glXClearErrorOccured();
-    CALL_GetPolygonStipple(GET_DISPATCH(), ((GLubyte *) answer));
+    glGetPolygonStipple((GLubyte *) answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -220,10 +208,8 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     /* target must be SEPARABLE_2D, however I guess we can let the GL
        barf on this one.... */
 
-    CALL_GetConvolutionParameteriv(GET_DISPATCH(),
-                                   (target, GL_CONVOLUTION_WIDTH, &width));
-    CALL_GetConvolutionParameteriv(GET_DISPATCH(),
-                                   (target, GL_CONVOLUTION_HEIGHT, &height));
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_WIDTH, &width);
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_HEIGHT, &height);
     /*
      * The two queries above might fail if we're in a state where queries
      * are illegal, but then width and height would still be zero anyway.
@@ -238,13 +224,11 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     compsize = __GLX_PAD(compsize);
     compsize2 = __GLX_PAD(compsize2);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize + compsize2, 1);
     __glXClearErrorOccured();
-    CALL_GetSeparableFilter(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                             *(GLenum *) (pc + 4),
-                                             *(GLenum *) (pc + 8),
-                                             answer, answer + compsize, NULL));
+    glGetSeparableFilter(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4),
+                         *(GLenum *) (pc + 8), answer, answer + compsize, NULL);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -299,15 +283,12 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     target = *(GLenum *) (pc + 0);
     swapBytes = *(GLboolean *) (pc + 12);
 
-    CALL_GetConvolutionParameteriv(GET_DISPATCH(),
-                                   (target, GL_CONVOLUTION_WIDTH, &width));
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_WIDTH, &width);
     if (target == GL_CONVOLUTION_1D) {
         height = 1;
     }
     else {
-        CALL_GetConvolutionParameteriv(GET_DISPATCH(),
-                                       (target, GL_CONVOLUTION_HEIGHT,
-                                        &height));
+        glGetConvolutionParameteriv(target, GL_CONVOLUTION_HEIGHT, &height);
     }
     /*
      * The two queries above might fail if we're in a state where queries
@@ -317,12 +298,11 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetConvolutionFilter(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                               *(GLenum *) (pc + 4),
-                                               *(GLenum *) (pc + 8), answer));
+    glGetConvolutionFilter(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4),
+                           *(GLenum *) (pc + 8), answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -378,8 +358,7 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     swapBytes = *(GLboolean *) (pc + 12);
     reset = *(GLboolean *) (pc + 13);
 
-    CALL_GetHistogramParameteriv(GET_DISPATCH(),
-                                 (target, GL_HISTOGRAM_WIDTH, &width));
+    glGetHistogramParameteriv(target, GL_HISTOGRAM_WIDTH, &width);
     /*
      * The one query above might fail if we're in a state where queries
      * are illegal, but then width would still be zero anyway.
@@ -388,10 +367,10 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetHistogram(GET_DISPATCH(), (target, reset, format, type, answer));
+    glGetHistogram(target, reset, format, type, answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -449,10 +428,10 @@ GetMinmax(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetMinmax(GET_DISPATCH(), (target, reset, format, type, answer));
+    glGetMinmax(target, reset, format, type, answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -505,8 +484,7 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     type = *(GLenum *) (pc + 8);
     swapBytes = *(GLboolean *) (pc + 12);
 
-    CALL_GetColorTableParameteriv(GET_DISPATCH(),
-                                  (target, GL_COLOR_TABLE_WIDTH, &width));
+    glGetColorTableParameteriv(target, GL_COLOR_TABLE_WIDTH, &width);
     /*
      * The one query above might fail if we're in a state where queries
      * are illegal, but then width would still be zero anyway.
@@ -515,12 +493,11 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetColorTable(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLenum *) (pc + 4),
-                                        *(GLenum *) (pc + 8), answer));
+    glGetColorTable(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4),
+                    *(GLenum *) (pc + 8), answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
diff --git a/xorg-server/glx/singlepixswap.c b/xorg-server/glx/singlepixswap.c
index c777cea00..846910153 100644
--- a/xorg-server/glx/singlepixswap.c
+++ b/xorg-server/glx/singlepixswap.c
@@ -38,10 +38,6 @@
 #include "unpack.h"
 #include "indirect_dispatch.h"
 #include "indirect_size_get.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 int
 __glXDispSwap_ReadPixels(__GLXclientState * cl, GLbyte * pc)
@@ -81,17 +77,13 @@ __glXDispSwap_ReadPixels(__GLXclientState * cl, GLbyte * pc)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_LSB_FIRST, lsbFirst));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
+    glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_ReadPixels(GET_DISPATCH(),
-                    (*(GLint *) (pc + 0),
-                     *(GLint *) (pc + 4),
-                     *(GLsizei *) (pc + 8),
-                     *(GLsizei *) (pc + 12),
-                     *(GLenum *) (pc + 16), *(GLenum *) (pc + 20), answer)
-        );
+    glReadPixels(*(GLint *) (pc + 0), *(GLint *) (pc + 4),
+                 *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12),
+                 *(GLenum *) (pc + 16), *(GLenum *) (pc + 20), answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -140,13 +132,10 @@ __glXDispSwap_GetTexImage(__GLXclientState * cl, GLbyte * pc)
     target = *(GLenum *) (pc + 0);
     swapBytes = *(GLboolean *) (pc + 16);
 
-    CALL_GetTexLevelParameteriv(GET_DISPATCH(),
-                                (target, level, GL_TEXTURE_WIDTH, &width));
-    CALL_GetTexLevelParameteriv(GET_DISPATCH(),
-                                (target, level, GL_TEXTURE_HEIGHT, &height));
+    glGetTexLevelParameteriv(target, level, GL_TEXTURE_WIDTH, &width);
+    glGetTexLevelParameteriv(target, level, GL_TEXTURE_HEIGHT, &height);
     if (target == GL_TEXTURE_3D) {
-        CALL_GetTexLevelParameteriv(GET_DISPATCH(),
-                                    (target, level, GL_TEXTURE_DEPTH, &depth));
+        glGetTexLevelParameteriv(target, level, GL_TEXTURE_DEPTH, &depth);
     }
     /*
      * The three queries above might fail if we're in a state where queries
@@ -157,13 +146,11 @@ __glXDispSwap_GetTexImage(__GLXclientState * cl, GLbyte * pc)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetTexImage(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                      *(GLint *) (pc + 4),
-                                      *(GLenum *) (pc + 8),
-                                      *(GLenum *) (pc + 12), answer));
+    glGetTexImage(*(GLenum *) (pc + 0), *(GLint *) (pc + 4),
+                  *(GLenum *) (pc + 8), *(GLenum *) (pc + 12), answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -205,11 +192,11 @@ __glXDispSwap_GetPolygonStipple(__GLXclientState * cl, GLbyte * pc)
     pc += __GLX_SINGLE_HDR_SIZE;
     lsbFirst = *(GLboolean *) (pc + 0);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_LSB_FIRST, lsbFirst));
+    glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
     __GLX_GET_ANSWER_BUFFER(answer, cl, 128, 1);
 
     __glXClearErrorOccured();
-    CALL_GetPolygonStipple(GET_DISPATCH(), ((GLubyte *) answer));
+    glGetPolygonStipple((GLubyte *) answer);
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
         __GLX_SWAP_REPLY_HEADER();
@@ -255,10 +242,8 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     /* target must be SEPARABLE_2D, however I guess we can let the GL
        barf on this one.... */
 
-    CALL_GetConvolutionParameteriv(GET_DISPATCH(),
-                                   (target, GL_CONVOLUTION_WIDTH, &width));
-    CALL_GetConvolutionParameteriv(GET_DISPATCH(),
-                                   (target, GL_CONVOLUTION_HEIGHT, &height));
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_WIDTH, &width);
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_HEIGHT, &height);
     /*
      * The two queries above might fail if we're in a state where queries
      * are illegal, but then width and height would still be zero anyway.
@@ -273,13 +258,11 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     compsize = __GLX_PAD(compsize);
     compsize2 = __GLX_PAD(compsize2);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize + compsize2, 1);
     __glXClearErrorOccured();
-    CALL_GetSeparableFilter(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                             *(GLenum *) (pc + 4),
-                                             *(GLenum *) (pc + 8),
-                                             answer, answer + compsize, NULL));
+    glGetSeparableFilter(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4),
+                         *(GLenum *) (pc + 8), answer, answer + compsize, NULL);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -342,15 +325,12 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     target = *(GLenum *) (pc + 0);
     swapBytes = *(GLboolean *) (pc + 12);
 
-    CALL_GetConvolutionParameteriv(GET_DISPATCH(),
-                                   (target, GL_CONVOLUTION_WIDTH, &width));
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_WIDTH, &width);
     if (target == GL_CONVOLUTION_2D) {
         height = 1;
     }
     else {
-        CALL_GetConvolutionParameteriv(GET_DISPATCH(),
-                                       (target, GL_CONVOLUTION_HEIGHT,
-                                        &height));
+        glGetConvolutionParameteriv(target, GL_CONVOLUTION_HEIGHT, &height);
     }
     /*
      * The two queries above might fail if we're in a state where queries
@@ -360,12 +340,11 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetConvolutionFilter(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                               *(GLenum *) (pc + 4),
-                                               *(GLenum *) (pc + 8), answer));
+    glGetConvolutionFilter(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4),
+                           *(GLenum *) (pc + 8), answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -429,8 +408,7 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     swapBytes = *(GLboolean *) (pc + 12);
     reset = *(GLboolean *) (pc + 13);
 
-    CALL_GetHistogramParameteriv(GET_DISPATCH(),
-                                 (target, GL_HISTOGRAM_WIDTH, &width));
+    glGetHistogramParameteriv(target, GL_HISTOGRAM_WIDTH, &width);
     /*
      * The one query above might fail if we're in a state where queries
      * are illegal, but then width would still be zero anyway.
@@ -439,10 +417,10 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetHistogram(GET_DISPATCH(), (target, reset, format, type, answer));
+    glGetHistogram(target, reset, format, type, answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -507,10 +485,10 @@ GetMinmax(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetMinmax(GET_DISPATCH(), (target, reset, format, type, answer));
+    glGetMinmax(target, reset, format, type, answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -569,8 +547,7 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     target = *(GLenum *) (pc + 0);
     swapBytes = *(GLboolean *) (pc + 12);
 
-    CALL_GetColorTableParameteriv(GET_DISPATCH(),
-                                  (target, GL_COLOR_TABLE_WIDTH, &width));
+    glGetColorTableParameteriv(target, GL_COLOR_TABLE_WIDTH, &width);
     /*
      * The one query above might fail if we're in a state where queries
      * are illegal, but then width would still be zero anyway.
@@ -579,12 +556,11 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetColorTable(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLenum *) (pc + 4),
-                                        *(GLenum *) (pc + 8), answer));
+    glGetColorTable(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4),
+                    *(GLenum *) (pc + 8), answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
diff --git a/xorg-server/glx/singlesize.c b/xorg-server/glx/singlesize.c
index 777ebb35e..4c60b6920 100644
--- a/xorg-server/glx/singlesize.c
+++ b/xorg-server/glx/singlesize.c
@@ -36,10 +36,6 @@
 #include "glxserver.h"
 #include "singlesize.h"
 #include "indirect_size_get.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 /*
 ** These routines compute the size of variable-size returned parameters.
@@ -75,7 +71,7 @@ __glGetMap_size(GLenum target, GLenum query)
         switch (query) {
         case GL_COEFF:
             k = __glMap1d_size(target);
-            CALL_GetMapiv(GET_DISPATCH(), (target, GL_ORDER, &order));
+            glGetMapiv(target, GL_ORDER, &order);
             /*
              ** The query above might fail, but then order will be zero anyway.
              */
@@ -99,7 +95,7 @@ __glGetMap_size(GLenum target, GLenum query)
         case GL_COEFF:
             k = __glMap2d_size(target);
             majorMinor[0] = majorMinor[1] = 0;
-            CALL_GetMapiv(GET_DISPATCH(), (target, GL_ORDER, majorMinor));
+            glGetMapiv(target, GL_ORDER, majorMinor);
             /*
              ** The query above might fail, but then majorMinor will be zeroes
              */
@@ -172,7 +168,7 @@ __glGetPixelMap_size(GLenum map)
     default:
         return -1;
     }
-    CALL_GetIntegerv(GET_DISPATCH(), (query, &size));
+    glGetIntegerv(query, &size);
     return size;
 }
 
diff --git a/xorg-server/glx/swap_interval.c b/xorg-server/glx/swap_interval.c
index 7533d2642..17bc99207 100644
--- a/xorg-server/glx/swap_interval.c
+++ b/xorg-server/glx/swap_interval.c
@@ -33,10 +33,6 @@
 #include "unpack.h"
 #include "indirect_size_get.h"
 #include "indirect_dispatch.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 #include "glxbyteorder.h"
 
 static int DoSwapInterval(__GLXclientState * cl, GLbyte * pc, int do_swap);
diff --git a/xorg-server/glx/xfont.c b/xorg-server/glx/xfont.c
index b203866d9..83a455d73 100644
--- a/xorg-server/glx/xfont.c
+++ b/xorg-server/glx/xfont.c
@@ -35,10 +35,6 @@
 #include "glxserver.h"
 #include "glxutil.h"
 #include "unpack.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 #include "indirect_dispatch.h"
 #include <GL/gl.h>
 #include <pixmapstr.h>
@@ -94,10 +90,8 @@ __glXMakeBitmapFromGlyph(FontPtr font, CharInfoPtr pci)
         pglyph -= widthPadded;
         p += widthPadded;
     }
-    CALL_Bitmap(GET_DISPATCH(), (w, h, -pci->metrics.leftSideBearing,
-                                 pci->metrics.descent,
-                                 pci->metrics.characterWidth, 0,
-                                 allocbuf ? allocbuf : buf));
+    glBitmap(w, h, -pci->metrics.leftSideBearing, pci->metrics.descent,
+             pci->metrics.characterWidth, 0, allocbuf ? allocbuf : buf);
 
     free(allocbuf);
     return Success;
@@ -118,13 +112,12 @@ MakeBitmapsFromFont(FontPtr pFont, int first, int count, int list_base)
     int rv;                     /* return value */
     int encoding = (FONTLASTROW(pFont) == 0) ? Linear16Bit : TwoD16Bit;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, FALSE));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_LSB_FIRST, BITMAP_BIT_ORDER == LSBFirst));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH, 0));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, 0));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, 0));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ALIGNMENT, GLYPHPADBYTES));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, FALSE);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, BITMAP_BIT_ORDER == LSBFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, GLYPHPADBYTES);
     for (i = 0; i < count; i++) {
         chs[0] = (first + i) >> 8;      /* high byte is first byte */
         chs[1] = first + i;
@@ -135,14 +128,14 @@ MakeBitmapsFromFont(FontPtr pFont, int first, int count, int list_base)
         /*
          ** Define a display list containing just a glBitmap() call.
          */
-        CALL_NewList(GET_DISPATCH(), (list_base + i, GL_COMPILE));
+        glNewList(list_base + i, GL_COMPILE);
         if (nglyphs) {
             rv = __glXMakeBitmapFromGlyph(pFont, pci);
             if (rv) {
                 return rv;
             }
         }
-        CALL_EndList(GET_DISPATCH(), ());
+        glEndList();
     }
     return Success;
 }
@@ -167,8 +160,7 @@ __glXDisp_UseXFont(__GLXclientState * cl, GLbyte * pc)
         return error;
     }
 
-    CALL_GetIntegerv(GET_DISPATCH(),
-                     (GL_LIST_INDEX, (GLint *) &currentListIndex));
+    glGetIntegerv(GL_LIST_INDEX, (GLint *) &currentListIndex);
     if (currentListIndex != 0) {
         /*
          ** A display list is currently being made.  It is an error
diff --git a/xorg-server/hw/dmx/dmx_glxvisuals.c b/xorg-server/hw/dmx/dmx_glxvisuals.c
index 56bd67b6e..b3bd3b79f 100644
--- a/xorg-server/hw/dmx/dmx_glxvisuals.c
+++ b/xorg-server/hw/dmx/dmx_glxvisuals.c
@@ -448,7 +448,12 @@ GetGLXFBConfigs(Display * dpy, int glxMajorOpcode, int *nconfigs)
         /* Fill in derived values */
         config->screen = screen;
 
-        config->rgbMode = config->renderType & GLX_RGBA_BIT;
+        /* The rgbMode should be true for any mode which has distinguishible
+         * R, G and B components
+         */
+        config->rgbMode = (config->renderType
+                           & (GLX_RGBA_BIT | GLX_RGBA_FLOAT_BIT_ARB
+                              | GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT)) != 0;
         config->colorIndexMode = !config->rgbMode;
 
         config->haveAccumBuffer =
diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c
index 335da37ac..190eeefe2 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmds.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c
@@ -123,6 +123,28 @@ GetBackEndDisplay(__GLXclientState * cl, int s)
     return cl->be_displays[s];
 }
 
+/**
+ * Convert the render type bits from fbconfig into context render type.
+ */
+static int
+renderTypeBitsToRenderTypeEnum(int fbRenderType)
+{
+    if (fbRenderType & GLX_RGBA_BIT)
+        return GLX_RGBA_TYPE;
+
+    if (fbRenderType & GLX_COLOR_INDEX_BIT)
+        return  GLX_COLOR_INDEX_TYPE;
+
+    if (fbRenderType & GLX_RGBA_FLOAT_BIT_ARB)
+        return GLX_RGBA_FLOAT_TYPE_ARB;
+
+    if (fbRenderType & GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT)
+        return GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT;
+
+    /* There's no recognized renderType in the config */
+    return GLX_RGBA_TYPE;
+}
+
 /*
 ** Create a GL context with the given properties.
 */
@@ -308,12 +330,14 @@ CreateContext(__GLXclientState * cl,
         /* send the create context request to the back-end server */
         dpy = GetBackEndDisplay(cl, screen);
         if (glxc->pFBConfig) {
-            /*Since for a certain visual both RGB and COLOR INDEX
-             *can be on then the only parmeter to choose the renderType
-             * should be the class of the colormap since all 4 first 
-             * classes does not support RGB mode only COLOR INDEX ,
-             * and so TrueColor and DirectColor does not support COLOR INDEX*/
-            int renderType = glxc->pFBConfig->renderType;
+            /* For a specific visual, multiple render types (i.e., both RGB
+             * and COLOR INDEX) can be accessible. The only parameter to
+             * choose the renderType should be the class of the colormap,
+             * since the first classes do not support RGB mode (only COLOR
+             * INDEX), and TrueColor and DirectColor do not support COLOR
+             * INDEX.
+             */
+            int renderType = GLX_RGBA_TYPE;
 
             if (pVisual) {
                 switch (pVisual->class) {
@@ -329,7 +353,11 @@ CreateContext(__GLXclientState * cl,
                     renderType = GLX_RGBA_TYPE;
                     break;
                 }
+            } else {
+                renderType =
+                    renderTypeBitsToRenderTypeEnum(glxc->pFBConfig->renderType);
             }
+
             if (__GLX_IS_VERSION_SUPPORTED(1, 3)) {
                 LockDisplay(dpy);
                 GetReq(GLXCreateNewContext, be_new_req);
@@ -3210,7 +3238,7 @@ __glXQueryContext(__GLXclientState * cl, GLbyte * pc)
     *pSendBuf++ = GLX_FBCONFIG_ID;
     *pSendBuf++ = (int) (ctx->pFBConfig->id);
     *pSendBuf++ = GLX_RENDER_TYPE;
-    *pSendBuf++ = (int) (ctx->pFBConfig->renderType);
+    *pSendBuf++ = renderTypeBitsToRenderTypeEnum(ctx->pFBConfig->renderType);
     *pSendBuf++ = GLX_SCREEN;
     *pSendBuf++ = (int) (ctx->pScreen->myNum);
 
diff --git a/xorg-server/hw/dmx/input/dmxevents.c b/xorg-server/hw/dmx/input/dmxevents.c
index 28756203b..bcb5c2ed8 100644
--- a/xorg-server/hw/dmx/input/dmxevents.c
+++ b/xorg-server/hw/dmx/input/dmxevents.c
@@ -726,8 +726,7 @@ dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
     case ButtonRelease:
         detail = dmxGetButtonMapping(dmxLocal, detail);
         valuator_mask_zero(&mask);
-        QueuePointerEvents(p, type, detail,
-                           POINTER_ABSOLUTE | POINTER_SCREEN, &mask);
+        QueuePointerEvents(p, type, detail, 0, &mask);
         return;
 
     case MotionNotify:
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c
index a603ef734..91e949d79 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.c
@@ -732,8 +732,6 @@ ephyrScreenFini(KdScreenInfo * screen)
     if (scrpriv->shadow) {
         KdShadowFbFree(screen);
     }
-    free(screen->driver);
-    screen->driver = NULL;
 }
 
 /*  
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index 527c7a2ef..d845830cc 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -308,21 +308,22 @@ KdEnableInput(void)
 
     kdInputEnabled = TRUE;
 
+    ev.any.time = GetTimeInMillis();
+
     for (ki = kdKeyboards; ki; ki = ki->next) {
         if (ki->driver && ki->driver->Enable)
             (*ki->driver->Enable) (ki);
+        /* reset screen saver */
+        NoticeEventTime (&ev, ki->dixdev);
     }
 
     for (pi = kdPointers; pi; pi = pi->next) {
         if (pi->driver && pi->driver->Enable)
             (*pi->driver->Enable) (pi);
+        /* reset screen saver */
+        NoticeEventTime (&ev, pi->dixdev);
     }
 
-    /* reset screen saver */
-    ev.any.time = GetTimeInMillis();
-    NoticeEventTime(&ev, pi->dixdev);
-    NoticeEventTime(&ev, ki->dixdev);
-
     OsReleaseSIGIO();
 }
 
diff --git a/xorg-server/hw/xfree86/common/xf86Bus.c b/xorg-server/hw/xfree86/common/xf86Bus.c
index e1015379b..329d0b3d5 100644
--- a/xorg-server/hw/xfree86/common/xf86Bus.c
+++ b/xorg-server/hw/xfree86/common/xf86Bus.c
@@ -266,7 +266,9 @@ xf86IsEntityPrimary(int entityIndex)
 {
     EntityPtr pEnt = xf86Entities[entityIndex];
 
-    if (primaryBus.type != pEnt->bus.type)
+    if (primaryBus.type == BUS_PLATFORM && pEnt->bus.type == BUS_PCI)
+	return MATCH_PCI_DEVICES(pEnt->bus.id.pci, primaryBus.id.plat->pdev);
+    else if (primaryBus.type != pEnt->bus.type)
         return FALSE;
 
     switch (pEnt->bus.type) {
diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index e0cec05b8..265b55348 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -80,9 +80,9 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(14, 1)
-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(19, 2)
-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(7, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(15, 0)
+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(20, 0)
+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(8, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
 
 #define MODINFOSTRING1	0xef23fdc5
diff --git a/xorg-server/hw/xfree86/common/xf86platformBus.c b/xorg-server/hw/xfree86/common/xf86platformBus.c
index e368deeb8..33b2b7dd8 100644
--- a/xorg-server/hw/xfree86/common/xf86platformBus.c
+++ b/xorg-server/hw/xfree86/common/xf86platformBus.c
@@ -466,6 +466,9 @@ xf86platformAddDevice(int index)
    /* attach unbound to 0 protocol screen */
    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
 
+   RRResourcesChanged(xf86Screens[0]->pScreen);
+   RRTellChanged(xf86Screens[0]->pScreen);
+
    return 0;
 }
 
@@ -508,6 +511,8 @@ xf86platformRemoveDevice(int index)
     xf86UnclaimPlatformSlot(&xf86_platform_devices[index], NULL);
 
     xf86_remove_platform_device(index);
+
+    RRResourcesChanged(xf86Screens[0]->pScreen);
     RRTellChanged(xf86Screens[0]->pScreen);
  out:
     return;
diff --git a/xorg-server/hw/xfree86/dixmods/glxmodule.c b/xorg-server/hw/xfree86/dixmods/glxmodule.c
index e6bb73673..133a2a65d 100644
--- a/xorg-server/hw/xfree86/dixmods/glxmodule.c
+++ b/xorg-server/hw/xfree86/dixmods/glxmodule.c
@@ -85,9 +85,6 @@ glxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
     xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n",
             xf86Info.aiglx ? "enabled" : "disabled");
     if (xf86Info.aiglx) {
-        provider = LoaderSymbol("__glXDRIProvider");
-        if (provider)
-            GlxPushProvider(provider);
         provider = LoaderSymbol("__glXDRI2Provider");
         if (provider)
             GlxPushProvider(provider);
diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index b79f023cd..4f09652f0 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -386,7 +386,9 @@ fbConfigsDump(unsigned int n, __GLXconfig * c)
                c->accumAlphaBits, c->sampleBuffers, c->samples,
                (c->drawableType & GLX_WINDOW_BIT) ? "y" : ".",
                (c->drawableType & GLX_PIXMAP_BIT) ? "y" : ".",
-               (c->drawableType & GLX_PBUFFER_BIT) ? "y" : ".", ".",
+               (c->drawableType & GLX_PBUFFER_BIT) ? "y" : ".",
+               (c->renderType & (GLX_RGBA_FLOAT_BIT_ARB |
+                   GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT)) ? "y" : ".",
                (c->transparentPixel != GLX_NONE_EXT) ? "y" : ".",
                c->visualSelectGroup,
                (c->visualRating == GLX_SLOW_VISUAL_EXT) ? "*" : " ");
diff --git a/xorg-server/randr/randr.c b/xorg-server/randr/randr.c
index cb6fce7cd..3c5142771 100644
--- a/xorg-server/randr/randr.c
+++ b/xorg-server/randr/randr.c
@@ -420,12 +420,40 @@ RRExtensionInit(void)
 #endif
 }
 
+void
+RRResourcesChanged(ScreenPtr pScreen)
+{
+    rrScrPriv(pScreen);
+    pScrPriv->resourcesChanged = TRUE;
+
+    RRSetChanged(pScreen);
+}
+
+static void
+RRDeliverResourceEvent(ClientPtr client, WindowPtr pWin)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    rrScrPriv(pScreen);
+
+    xRRResourceChangeNotifyEvent re = {
+        .type = RRNotify + RREventBase,
+        .subCode = RRNotify_ResourceChange,
+        .timestamp = pScrPriv->lastSetTime.milliseconds,
+        .window = pWin->drawable.id
+    };
+
+    WriteEventsToClient(client, 1, (xEvent *) &re);
+}
+
 static int
 TellChanged(WindowPtr pWin, pointer value)
 {
     RREventPtr *pHead, pRREvent;
     ClientPtr client;
     ScreenPtr pScreen = pWin->drawable.pScreen;
+    ScreenPtr iter;
+    rrScrPrivPtr pSlaveScrPriv;
 
     rrScrPriv(pScreen);
     int i;
@@ -450,6 +478,16 @@ TellChanged(WindowPtr pWin, pointer value)
                 if (crtc->changed)
                     RRDeliverCrtcEvent(client, pWin, crtc);
             }
+
+            xorg_list_for_each_entry(iter, &pScreen->output_slave_list, output_head) {
+                pSlaveScrPriv = rrGetScrPriv(iter);
+                for (i = 0; i < pSlaveScrPriv->numCrtcs; i++) {
+                    RRCrtcPtr crtc = pSlaveScrPriv->crtcs[i];
+
+                    if (crtc->changed)
+                        RRDeliverCrtcEvent(client, pWin, crtc);
+                }
+            }
         }
 
         if (pRREvent->mask & RROutputChangeNotifyMask) {
@@ -459,6 +497,40 @@ TellChanged(WindowPtr pWin, pointer value)
                 if (output->changed)
                     RRDeliverOutputEvent(client, pWin, output);
             }
+
+            xorg_list_for_each_entry(iter, &pScreen->output_slave_list, output_head) {
+                pSlaveScrPriv = rrGetScrPriv(iter);
+                for (i = 0; i < pSlaveScrPriv->numOutputs; i++) {
+                    RROutputPtr output = pSlaveScrPriv->outputs[i];
+
+                    if (output->changed)
+                        RRDeliverOutputEvent(client, pWin, output);
+                }
+            }
+        }
+
+        if (pRREvent->mask & RRProviderChangeNotifyMask) {
+            xorg_list_for_each_entry(iter, &pScreen->output_slave_list, output_head) {
+                pSlaveScrPriv = rrGetScrPriv(iter);
+                if (pSlaveScrPriv->provider->changed)
+                    RRDeliverProviderEvent(client, pWin, pSlaveScrPriv->provider);
+            }
+            xorg_list_for_each_entry(iter, &pScreen->offload_slave_list, offload_head) {
+                pSlaveScrPriv = rrGetScrPriv(iter);
+                if (pSlaveScrPriv->provider->changed)
+                    RRDeliverProviderEvent(client, pWin, pSlaveScrPriv->provider);
+            }
+            xorg_list_for_each_entry(iter, &pScreen->unattached_list, unattached_head) {
+                pSlaveScrPriv = rrGetScrPriv(iter);
+                if (pSlaveScrPriv->provider->changed)
+                    RRDeliverProviderEvent(client, pWin, pSlaveScrPriv->provider);
+            }
+        }
+
+        if (pRREvent->mask & RRResourceChangeNotifyMask) {
+            if (pScrPriv->resourcesChanged) {
+                RRDeliverResourceEvent(client, pWin);
+            }
         }
     }
     return WT_WALKCHILDREN;
@@ -496,6 +568,8 @@ RRTellChanged(ScreenPtr pScreen)
     rrScrPriv(pScreen);
     rrScrPrivPtr mastersp;
     int i;
+    ScreenPtr iter;
+    rrScrPrivPtr pSlaveScrPriv;
 
     if (pScreen->isGPU) {
         master = pScreen->current_master;
@@ -514,11 +588,33 @@ RRTellChanged(ScreenPtr pScreen)
         }
         pScrPriv->changed = FALSE;
         mastersp->changed = FALSE;
+
         WalkTree(master, TellChanged, (pointer) master);
+
+        mastersp->resourcesChanged = FALSE;
+
         for (i = 0; i < pScrPriv->numOutputs; i++)
             pScrPriv->outputs[i]->changed = FALSE;
         for (i = 0; i < pScrPriv->numCrtcs; i++)
             pScrPriv->crtcs[i]->changed = FALSE;
+
+        xorg_list_for_each_entry(iter, &master->output_slave_list, output_head) {
+            pSlaveScrPriv = rrGetScrPriv(iter);
+            pSlaveScrPriv->provider->changed = FALSE;
+            for (i = 0; i < pSlaveScrPriv->numOutputs; i++)
+                pSlaveScrPriv->outputs[i]->changed = FALSE;
+            for (i = 0; i < pSlaveScrPriv->numCrtcs; i++)
+                pSlaveScrPriv->crtcs[i]->changed = FALSE;
+        }
+        xorg_list_for_each_entry(iter, &master->offload_slave_list, offload_head) {
+            pSlaveScrPriv = rrGetScrPriv(iter);
+            pSlaveScrPriv->provider->changed = FALSE;
+        }
+        xorg_list_for_each_entry(iter, &master->unattached_list, unattached_head) {
+            pSlaveScrPriv = rrGetScrPriv(iter);
+            pSlaveScrPriv->provider->changed = FALSE;
+        }
+
         if (mastersp->layoutChanged) {
             pScrPriv->layoutChanged = FALSE;
             RRPointerScreenConfigured(master);
diff --git a/xorg-server/randr/randrstr.h b/xorg-server/randr/randrstr.h
index 2babfedd2..15299fd6d 100644
--- a/xorg-server/randr/randrstr.h
+++ b/xorg-server/randr/randrstr.h
@@ -164,6 +164,7 @@ struct _rrProvider {
     int nameLength;
     RRPropertyPtr properties;
     Bool pendingProperties;
+    Bool changed;
     struct _rrProvider *offload_sink;
     struct _rrProvider *output_source;
 };
@@ -300,6 +301,7 @@ typedef struct _rrScrPriv {
     Bool changed;               /* some config changed */
     Bool configChanged;         /* configuration changed */
     Bool layoutChanged;         /* screen layout changed */
+    Bool resourcesChanged;      /* screen resources change */
 
     CARD16 minWidth, minHeight;
     CARD16 maxWidth, maxHeight;
@@ -485,6 +487,9 @@ extern _X_EXPORT int
 extern _X_EXPORT void
  RRDeliverScreenEvent(ClientPtr client, WindowPtr pWin, ScreenPtr pScreen);
 
+extern _X_EXPORT void
+ RRResourcesChanged(ScreenPtr pScreen);
+
 /* randr.c */
 /* set a screen change on the primary screen */
 extern _X_EXPORT void
@@ -923,6 +928,9 @@ RRProviderSetCapabilities(RRProviderPtr provider, uint32_t capabilities);
 extern _X_EXPORT Bool
 RRProviderLookup(XID id, RRProviderPtr *provider_p);
 
+extern _X_EXPORT void
+RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
+
 /* rrproviderproperty.c */
 
 extern _X_EXPORT void
diff --git a/xorg-server/randr/rrcrtc.c b/xorg-server/randr/rrcrtc.c
index 2f76b62be..99b3dca08 100644
--- a/xorg-server/randr/rrcrtc.c
+++ b/xorg-server/randr/rrcrtc.c
@@ -102,6 +102,8 @@ RRCrtcCreate(ScreenPtr pScreen, void *devPrivate)
     crtc->pScreen = pScreen;
     pScrPriv->crtcs[pScrPriv->numCrtcs++] = crtc;
 
+    RRResourcesChanged(pScreen);
+
     return crtc;
 }
 
@@ -669,6 +671,8 @@ RRCrtcDestroyResource(pointer value, XID pid)
                 break;
             }
         }
+
+        RRResourcesChanged(pScreen);
     }
 
     if (crtc->scanout_pixmap)
diff --git a/xorg-server/randr/rroutput.c b/xorg-server/randr/rroutput.c
index 922d61f3d..2b0b82f4c 100644
--- a/xorg-server/randr/rroutput.c
+++ b/xorg-server/randr/rroutput.c
@@ -101,6 +101,9 @@ RROutputCreate(ScreenPtr pScreen,
         return NULL;
 
     pScrPriv->outputs[pScrPriv->numOutputs++] = output;
+
+    RRResourcesChanged(pScreen);
+
     return output;
 }
 
@@ -355,6 +358,8 @@ RROutputDestroyResource(pointer value, XID pid)
                 break;
             }
         }
+
+        RRResourcesChanged(pScreen);
     }
     if (output->modes) {
         for (m = 0; m < output->numModes; m++)
diff --git a/xorg-server/randr/rrprovider.c b/xorg-server/randr/rrprovider.c
index b321e6227..2334ad277 100644
--- a/xorg-server/randr/rrprovider.c
+++ b/xorg-server/randr/rrprovider.c
@@ -304,6 +304,9 @@ ProcRRSetProviderOutputSource(ClientPtr client)
 
     pScrPriv->rrProviderSetOutputSource(pScreen, provider, source_provider);
 
+    provider->changed = TRUE;
+    RRSetChanged(pScreen);
+
     RRTellChanged (pScreen);
 
     return Success;
@@ -333,6 +336,9 @@ ProcRRSetProviderOffloadSink(ClientPtr client)
 
     pScrPriv->rrProviderSetOffloadSink(pScreen, provider, sink_provider);
 
+    provider->changed = TRUE;
+    RRSetChanged(pScreen);
+
     RRTellChanged (pScreen);
 
     return Success;
@@ -357,6 +363,7 @@ RRProviderCreate(ScreenPtr pScreen, const char *name,
     provider->nameLength = nameLength;
     memcpy(provider->name, name, nameLength);
     provider->name[nameLength] = '\0';
+    provider->changed = FALSE;
 
     if (!AddResource (provider->id, RRProviderType, (pointer) provider))
         return NULL;
@@ -416,3 +423,21 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p)
         return TRUE;
     return FALSE;
 }
+
+void
+RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    rrScrPriv(pScreen);
+
+    xRRProviderChangeNotifyEvent pe = {
+        .type = RRNotify + RREventBase,
+        .subCode = RRNotify_ProviderChange,
+        .timestamp = pScrPriv->lastSetTime.milliseconds,
+        .window = pWin->drawable.id,
+        .provider = provider->id
+    };
+
+    WriteEventsToClient(client, 1, (xEvent *) &pe);
+}
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 64714675b..d4ecb64bc 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -2174,19 +2174,19 @@
         <variant>
           <configItem>
             <name>nativo</name>
-            <_description>Portuguese (Brazil, nativo)</_description>
+            <_description>Portuguese (Brazil, Nativo)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Portuguese (Brazil, nativo for US keyboards)</_description>
+            <_description>Portuguese (Brazil, Nativo for US keyboards)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-epo</name>
-            <_description>Portuguese (Brazil, nativo for Esperanto)</_description>
+            <_description>Esperanto (Brazil, Nativo)</_description>
             <languageList>
               <iso639Id>epo</iso639Id>
             </languageList>
diff --git a/xorg-server/xkeyboard-config/symbols/br b/xorg-server/xkeyboard-config/symbols/br
index b75ffc98c..85f5f5522 100644
--- a/xorg-server/xkeyboard-config/symbols/br
+++ b/xorg-server/xkeyboard-config/symbols/br
@@ -1,45 +1,40 @@
-//
-// based on 
-// "a very simple Brasilian ABNT2 keyboard
-// by Ricardo Y. Igarashi (iga@that.com.br)
-// Adds suport for dead-keys in I18N applications
-// by Conectiva  (http://www.conectiva.com.br)"
-//
-
 default
 xkb_symbols "abnt2" {
 
+    // Based on a very simple Brazilian ABNT2 keyboard,
+    // by Ricardo Y. Igarashi (iga@that.com.br).
+    // With added support for dead keys in I18N applications,
+    // by Conectiva  (http://www.conectiva.com.br).
+
     include "latin"
     name[Group1]="Portuguese (Brazil)";
 
-    key <AE02>	{ [         2,         at,  twosuperior,      onehalf ]	};
-    key <AE03>	{ [         3, numbersign, threesuperior, threequarters ] };
-    key <AE04>	{ [         4,     dollar,     sterling,   onequarter ]	};
-    key <AE05>	{ [         5,    percent,         cent, threeeighths ]	};
-    key <AE06>	{ [         6, dead_diaeresis,  notsign,    diaeresis ]	};
-    key <AE12>	{ [     equal,       plus,      section,  dead_ogonek ]	};
-
-    key <AD01>  { [         q,          Q,        slash,        slash ] };   
-    key <AD02>  { [         w,          W,     question,     question ] };   
-    key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
-    key <AD04>	{ [         r,          R,   registered,   registered ]	};
-    key <AD11>	{ [dead_acute, dead_grave,        acute,        grave ]	};
-    key <AD12>	{ [bracketleft,  braceleft, ordfeminine,  dead_macron ]	};
-
-    key <AC10>	{ [  ccedilla,   Ccedilla,  dead_acute, dead_doubleacute] };
-    key <AC11>	{ [dead_tilde, dead_circumflex, asciitilde, asciicircum ] };
-    key <BKSL>  { [bracketright, braceright,  masculine,    masculine   ] };
-
-    key <TLDE>	{ [apostrophe,   quotedbl,      notsign,      notsign ]	};
-
-    key <LSGT>	{ [ backslash,        bar,    masculine,   dead_breve ]	};
-    key <AB03>	{ [         c,          C,    copyright,    copyright ]	};
-    key <AB07>  { [         m,          M,           mu,           mu ] };
-    key <AB10>	{ [ semicolon,    colon, dead_belowdot, dead_abovedot ]	};
-
-// ABNT-2 keyboard has this special key
-
-    key <AB11>	{ [     slash,   question,       degree, questiondown ]	};
+    key <TLDE> { [   apostrophe,       quotedbl,       notsign,         notsign ] };
+    key <AE02> { [            2,             at,   twosuperior,         onehalf ] };
+    key <AE03> { [            3,     numbersign, threesuperior,   threequarters ] };
+    key <AE04> { [            4,         dollar,      sterling,      onequarter ] };
+    key <AE05> { [            5,        percent,          cent,    threeeighths ] };
+    key <AE06> { [            6, dead_diaeresis,       notsign,       diaeresis ] };
+    key <AE12> { [        equal,           plus,       section,     dead_ogonek ] };
+
+    key <AD01> { [            q,              Q,         slash,           slash ] };
+    key <AD02> { [            w,              W,      question,        question ] };
+    key <AD03> { [            e,              E,      EuroSign,        EuroSign ] };
+    key <AD04> { [            r,              R,    registered,      registered ] };
+    key <AD11> { [   dead_acute,     dead_grave,         acute,           grave ] };
+    key <AD12> { [  bracketleft,      braceleft,   ordfeminine,     dead_macron ] };
+    key <BKSL> { [ bracketright,     braceright,     masculine,       masculine ] };
+
+    key <AC10> { [     ccedilla,       Ccedilla,    dead_acute,dead_doubleacute ] };
+    key <AC11> { [   dead_tilde,dead_circumflex,    asciitilde,     asciicircum ] };
+
+    key <LSGT> { [    backslash,            bar,     masculine,      dead_breve ] };
+    key <AB03> { [            c,              C,     copyright,       copyright ] };
+    key <AB07> { [            m,              M,            mu,              mu ] };
+    key <AB10> { [    semicolon,          colon, dead_belowdot,   dead_abovedot ] };
+
+    // The ABNT-2 keyboard has this special key:
+    key <AB11> { [        slash,       question,        degree,    questiondown ] };
 
     modifier_map Mod3   { Scroll_Lock };
 
@@ -51,27 +46,27 @@ xkb_symbols "abnt2" {
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
 
-    include "br(abnt2)" // for consistent naming
+    include "br(abnt2)"
     name[Group1]="Portuguese (Brazil, eliminate dead keys)";
 
-    key <AE06>	{ [         6,  diaeresis,      notsign,      notsign ]	};
-    key <AD11>	{ [apostrophe,      grave ]	};
-    key <AC10>	{ [  ccedilla,   Ccedilla,        acute,  doubleacute ]	};
-    key <AC11>	{ [asciitilde, asciicircum ]	};
-    key <AB10>	{ [ semicolon,      colon, dead_belowdot,    abovedot ]	};
+    key <AE06> { [            6,      diaeresis,       notsign,         notsign ] };
+    key <AD11> { [   apostrophe,          grave                                 ] };
+    key <AC10> { [     ccedilla,       Ccedilla,         acute,     doubleacute ] };
+    key <AC11> { [   asciitilde,    asciicircum                                 ] };
+    key <AB10> { [    semicolon,          colon, dead_belowdot,        abovedot ] };
 };
 
 
-// ABNT2 Keyboard to IBM/Lenovo Thinkpads 
-// by Piter PUNK <piterpk@terra.com.br>
+// The ABNT2 keyboard on IBM/Lenovo Thinkpads,
+// by Piter PUNK <piterpk@terra.com.br>.
 //
 partial alphanumeric_keys
 xkb_symbols "thinkpad" {
 
-    include "br(abnt2)" // for consistent naming
+    include "br(abnt2)"
     name[Group1]="Portuguese (Brazil)";
 
-    key <RCTL> { [     slash,   question,       degree, questiondown ] };
+    key <RCTL> { [        slash,       question,        degree,    questiondown ] };
 };
 
 
@@ -81,37 +76,36 @@ xkb_symbols "olpc" {
     include "us(basic)"
     name[Group1]="Portuguese (Brazil)";
 
-    key <TLDE> { [   apostrophe,       quotedbl                                ] };
-
-    key <AE01> { [           1,          exclam,   onesuperior                 ] };
-    key <AE02> { [           2,              at,   twosuperior                 ] };
-    key <AE03> { [           3,      numbersign, threesuperior                 ] };
-    key <AE04> { [           4,          dollar,      sterling                 ] };
-    key <AE05> { [           5,         percent,          cent                 ] };
-    key <AE06> { [           6,  dead_diaeresis,       notsign                 ] };
-    key <AE12>  { [       equal,           plus,       section                 ] };
-
-    key <AD03> { [            e,              E,      EuroSign                 ] };
-    key <AD11> { [   dead_acute,      dead_grave,        acute,          grave ] };
+    key <TLDE> { [   apostrophe,        quotedbl                                ] };
+    key <AE01> { [            1,          exclam,   onesuperior                 ] };
+    key <AE02> { [            2,              at,   twosuperior                 ] };
+    key <AE03> { [            3,      numbersign, threesuperior                 ] };
+    key <AE04> { [            4,          dollar,      sterling                 ] };
+    key <AE05> { [            5,         percent,          cent                 ] };
+    key <AE06> { [            6,  dead_diaeresis,       notsign                 ] };
+    key <AE12> { [        equal,            plus,       section                 ] };
+
+    key <AD03> { [            e,               E,      EuroSign                 ] };
+    key <AD11> { [   dead_acute,      dead_grave,         acute,          grave ] };
     key <AD12> { [  bracketleft,       braceleft,     0x10000AA                 ] };
+    key <BKSL> { [ bracketright,      braceright,     0x10000BA                 ] };
 
-    key <AC10> { [     ccedilla,       Ccedilla                                ] };
-    key <AC11> { [   dead_tilde, dead_circumflex                               ] };
-    key <BKSL> { [ bracketright,      braceright,     0x10000BA                        ] };
+    key <AC10> { [     ccedilla,        Ccedilla                                ] };
+    key <AC11> { [   dead_tilde, dead_circumflex                                ] };
 
-    key <AB01> { [            z,              Z,           bar                 ] };
-    key <AB03> { [            c,              C,     0x10020A2                 ] };
-    key <AB09> { [       period,        greater,     backslash                 ] };
+    key <AB01> { [            z,               Z,           bar                 ] };
+    key <AB03> { [            c,               C,     0x10020A2                 ] };
+    key <AB09> { [       period,         greater,     backslash                 ] };
     key <AB10> { [    semicolon,           colon                                ] };
 
-    key <I219> { [        slash,       question,        degree, ISO_Next_Group ] };
+    key <I219> { [        slash,        question,        degree, ISO_Next_Group ] };
 
     include "level3(ralt_switch)"
 };
 
 
 //
-// Brazilian Dvorak keyboard                               2005-04-18
+// Brazilian Dvorak layout                                 2005-04-18
 // "Teclado Simplificado Brasileiro" ou "Dvorak Brasileiro"
 //
 // Heitor Moraes    heitor.moraes@gmail.com
@@ -146,7 +140,7 @@ xkb_symbols "dvorak" {
     key <AD03> { [       period,         greater,           0x01002022,   periodcentered ] };
     key <AD04> { [            p,               P,                thorn,            THORN ] };
     key <AD05> { [            y,               Y,                  yen,              yen ] };
-    key <AD06> { [            f,               F,  leftdoublequotemark, leftsinglequotemark ] };
+    key <AD06> { [            f,               F,  leftdoublequotemark,  leftsinglequotemark ] };
     key <AD07> { [            g,               G, rightdoublequotemark, rightsinglequotemark ] };
     key <AD08> { [            c,               C,              uparrow,        copyright ] };
     key <AD09> { [            r,               R,           registered,       registered ] };
@@ -189,21 +183,19 @@ xkb_symbols "dvorak" {
 
 // Configures the use of the AltGr key
     include "level3(ralt_switch)"
-
 };
 
 
 //
-// Teclado Nativo Brasileiro                               2005-07-19
-// Brazilian Nativo Keyboard
-//      This is a Dvorak-based layout, designed for the Portuguese language
+// Brazilian Nativo layout.
+//     This is a Dvorak-based layout, designed for the Portuguese language.
 //
-// Ari Caldeira     ari@tecladobrasileiro.com.br
+// Ari Caldeira    <ari@tecladobrasileiro.com.br>    2005-07-19
 //
 partial alphanumeric_keys
 xkb_symbols "nativo" {
 
-    name[Group1]="Portuguese (Brazil, nativo)";
+    name[Group1]="Portuguese (Brazil, Nativo)";
 
 // Numeric row
     key <TLDE> { [        equal,            plus,              section,        plusminus ] };
@@ -256,8 +248,8 @@ xkb_symbols "nativo" {
     key <AB04> { [            b,               B,        guillemotleft,       0x01002039 ] };
     key <AB05> { [            k,               K,       guillemotright,       0x0100203A ] };
     key <AB06> { [            q,               Q,           0x01000259,       0x0100018F ] };
-    key <AB07> { [            v,               V,   doublelowquotemark, singlelowquotemark ] };
-    key <AB08> { [            g,               G,  leftdoublequotemark, leftsinglequotemark ] };
+    key <AB07> { [            v,               V,   doublelowquotemark,   singlelowquotemark ] };
+    key <AB08> { [            g,               G,  leftdoublequotemark,  leftsinglequotemark ] };
     key <AB09> { [            f,               F, rightdoublequotemark, rightsinglequotemark ] };
     key <AB10> { [            z,               Z,           0x0100201F,       0x0100201B ] };
     key <AB11> { [    backslash,             bar,             currency,        brokenbar ] };
@@ -269,51 +261,45 @@ xkb_symbols "nativo" {
 
 // Configures the use of the AltGr key
     include "level3(ralt_switch)"
-
 };
 
 
 //
-// Teclado Nativo Brasileiro para o teclado estadunidense  2005-07-19
-// Brazilian Nativo Keyboard for USA keyboards
+// Brazilian Nativo layout for US keyboards.
 //
-// Ari Caldeira     ari@tecladobrasileiro.com.br
+// Ari Caldeira    <ari@tecladobrasileiro.com.br>    2005-07-19
 //
 partial alphanumeric_keys
 xkb_symbols "nativo-us" {
+
     include "br(nativo)"
 
-    name[Group1]="Portuguese (Brazil, nativo for US keyboards)";
+    name[Group1]="Portuguese (Brazil, Nativo for US keyboards)";
 
-// Lower row
     key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
     key <AB02> { [    semicolon,           colon,             backslash,             bar ] };
-
 };
 
 
 //
-// Teclado Nativo Brasileiro para digitacao em Esperanto   2005-07-19
-// Brazilian Nativo Keyboard for typing Esperanto
+// Brazilian Nativo layout for typing Esperanto.
 //
-// Ari Caldeira     ari@tecladobrasileiro.com.br
+// Ari Caldeira    <ari@tecladobrasileiro.com.br>    2005-07-19
 //
 partial alphanumeric_keys
 xkb_symbols "nativo-epo" {
+
     include "br(nativo)"
 
-    name[Group1]="Portuguese (Brazil, nativo for Esperanto)";
+    name[Group1]="Esperanto (Brazil, Nativo)";
 
-// Upper row Esperanto
     key <AD04> { [            h,               H,          hcircumflex,      Hcircumflex ] };
     key <AD05> { [  ccircumflex,     Ccircumflex,                    x,                X ] };
     key <AD06> { [       ubreve,          Ubreve,                    w,                W ] };
 
-// Lower row Esperanto
     key <AB01> { [  jcircumflex,     Jcircumflex,                    y,                Y ] };
     key <AB02> { [  scircumflex,     Scircumflex,             ccedilla,         Ccedilla ] };
     key <AB06> { [  gcircumflex,     Gcircumflex,                    q,                Q ] };
-
 };
 
 // EXTRAS:
diff --git a/xorg-server/xkeyboard-config/symbols/pt b/xorg-server/xkeyboard-config/symbols/pt
index db3dde907..9a6cffc57 100644
--- a/xorg-server/xkeyboard-config/symbols/pt
+++ b/xorg-server/xkeyboard-config/symbols/pt
@@ -1,26 +1,23 @@
-// based on a keyboard map from an 'xkb/symbols/pt' file
-
 default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
     include "latin(type4)"
-
     name[Group1]="Portuguese";
 
-    key <LSGT>  { [      less,    greater,    backslash,    backslash ] };
-    key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};
-    key <AE04>	{ [         4,     dollar,      section,       dollar ]	};
-    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};
-    key <AE12>	{ [guillemotleft, guillemotright, dead_cedilla, dead_ogonek ] };
+    key <TLDE> { [     backslash,             bar,        notsign,          notsign ] };
+    key <AE03> { [             3,      numbersign,       sterling,         sterling ] };
+    key <AE04> { [             4,          dollar,        section,           dollar ] };
+    key <AE11> { [    apostrophe,        question,      backslash,     questiondown ] };
+    key <AE12> { [ guillemotleft,  guillemotright,   dead_cedilla,      dead_ogonek ] };
 
-    key <AD11>	{ [      plus,   asterisk, dead_diaeresis, dead_abovering ] };
-    key <AD12>	{ [dead_acute, dead_grave,   dead_tilde,  dead_macron ]	};
+    key <AD11> { [          plus,        asterisk, dead_diaeresis,   dead_abovering ] };
+    key <AD12> { [    dead_acute,      dead_grave,     dead_tilde,      dead_macron ] };
+    key <BKSL> { [    dead_tilde, dead_circumflex,     dead_grave,       dead_breve ] };
 
-    key <AC10>	{ [  ccedilla,   Ccedilla,   dead_acute, dead_doubleacute ] };
-    key <AC11>	{ [ masculine, ordfeminine, dead_circumflex,   dead_caron ] };
-    key <TLDE>	{ [ backslash,        bar,      notsign,      notsign ]	};
+    key <AC10> { [      ccedilla,        Ccedilla,     dead_acute, dead_doubleacute ] };
+    key <AC11> { [     masculine,     ordfeminine,dead_circumflex,       dead_caron ] };
 
-    key <BKSL>	{ [dead_tilde, dead_circumflex, dead_grave, dead_breve]	};
+    key <LSGT> { [          less,         greater,      backslash,        backslash ] };
 
     include "level3(ralt_switch)"
 };
@@ -28,81 +25,79 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "Sundeadkeys" {
 
-    include "pt(basic)" // for consistent naming
+    include "pt(basic)"
 
-    key <AD11>	{ [plus,   asterisk, dead_diaeresis, dead_diaeresis ]	};
-    key <BKSL>	{ [dead_tilde, dead_circumflex ]	};
-    key <AD12>	{ [dead_acute, dead_grave ]	};
+    key <AD11> { [          plus,        asterisk, dead_diaeresis,   dead_diaeresis ] };
+    key <AD12> { [    dead_acute,      dead_grave                                   ] };
+    key <BKSL> { [    dead_tilde, dead_circumflex                                   ] };
 };
 
 partial alphanumeric_keys
 xkb_symbols "sundeadkeys" {
-    include "pt(Sundeadkeys)" // for consistent naming
-
+    include "pt(Sundeadkeys)"
     name[Group1]="Portuguese (Sun dead keys)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
 
-    include "pt(basic)" // for consistent naming
-
+    include "pt(basic)"
     name[Group1]="Portuguese (eliminate dead keys)";
 
-    key <AE12>	{ [guillemotleft, guillemotright, cedilla,     ogonek ]	};
-    key <AD11>	{ [      plus,   asterisk,     quotedbl,     quotedbl ]	};
-    key <AD12>	{ [     acute,      grave ]	};
-    key <AC10>	{ [  ccedilla,   Ccedilla,        acute,  doubleacute ]	};
-    key <AC11>	{ [ masculine, ordfeminine, asciicircum,        caron ]	};
-    key <BKSL>	{ [asciitilde, asciicircum ]	};
-    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
+    key <AE12> { [ guillemotleft,  guillemotright,        cedilla,           ogonek ] };
+    key <AD11> { [          plus,        asterisk,       quotedbl,         quotedbl ] };
+    key <AD12> { [         acute,           grave                                   ] };
+    key <BKSL> { [    asciitilde,     asciicircum                                   ] };
+    key <AC10> { [      ccedilla,        Ccedilla,          acute,      doubleacute ] };
+    key <AC11> { [     masculine,     ordfeminine,    asciicircum,            caron ] };
+    key <AB10> { [         minus,      underscore,  dead_belowdot,         abovedot ] };
 };
 
-// mac version from Ricardo Cabral <bfe00991@mail.telepac.pt>
-// Copied from macintosh_vndr/pt
-partial alphanumeric_keys 
+// Layout variant for Mac, by Ricardo Cabral <bfe00991@mail.telepac.pt>.
+partial alphanumeric_keys
 xkb_symbols "mac" {
 
     include "pt"
     name[Group1]= "Portuguese (Macintosh)";
 
-    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
-    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
-    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
-    key <AE12>	{ [      plus,   asterisk, dead_diaeresis     ]	};
-    key <AC11>	{ [ dead_tilde, dead_circumflex       ]	};
-    key <AD11>	{ [ masculine, ordfeminine            ]	};
-    key <BKSL>	{ [ backslash,        bar,   dead_grave,   dead_breve ]	};
-    key <TLDE>	{ [     grave, asciitilde,      notsign,      notsign ]	};
+    key <TLDE> { [         grave,      asciitilde,        notsign,          notsign ] };
+    key <AE06> { [             6,       ampersand,  threequarters,      fiveeighths ] };
+    key <AE08> { [             8,       parenleft,    bracketleft,        braceleft ] };
+    key <AE09> { [             9,      parenright,   bracketright,       braceright ] };
+    key <AE12> { [          plus,        asterisk, dead_diaeresis                   ] };
+    key <AD11> { [     masculine,     ordfeminine                                   ] };
+    key <BKSL> { [     backslash,             bar,     dead_grave,       dead_breve ] };
+    key <AC11> { [    dead_tilde, dead_circumflex                                   ] };
 };
 
-partial alphanumeric_keys 
+partial alphanumeric_keys
 xkb_symbols "mac_sundeadkeys" {
+
     include "pt(mac)"
     name[Group1]= "Portuguese (Macintosh, Sun dead keys)";
-    
-    key <AE12> {	[	     plus,        asterisk,  dead_diaeresis, dead_diaeresis      ]	};
-    key <AC11> {	[     dead_tilde,    dead_circumflex	]	};
-    key <AD12> {	[     dead_acute,     dead_grave 	]	};
+
+    key <AE12> { [          plus,        asterisk, dead_diaeresis,   dead_diaeresis ] };
+    key <AD12> { [    dead_acute,      dead_grave                                   ] };
+    key <AC11> { [    dead_tilde, dead_circumflex                                   ] };
 };
 
-partial alphanumeric_keys 
+partial alphanumeric_keys
 xkb_symbols "mac_nodeadkeys" {
+
     include "pt(mac)"
     name[Group1]= "Portuguese (Macintosh, eliminate dead keys)";
 
-    key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};
-    key <AC11> {	[      asciitilde,     asciicircum	]	};
-    key <AD12> {	[	    acute,           grave 	]	};
+    key <AE12> { [          plus,       asterisk,         quotedbl,        quotedbl ] };
+    key <AD12> { [         acute,          grave                                    ] };
+    key <AC11> { [    asciitilde,    asciicircum                                    ] };
 };
 
 
 //
-// Teclado Nativo Portugues                                2005-07-19
-// Portuguese Nativo Keyboard
-//      This is a Dvorak-based layout, designed for the Portuguese language
+// Portuguese Nativo layout.
+//     This is a Dvorak-based layout, designed for the Portuguese language.
 //
-// Ari Caldeira     ari@tecladobrasileiro.com.br
+// Ari Caldeira    <ari@tecladobrasileiro.com.br>    2005-07-19
 //
 partial alphanumeric_keys
 xkb_symbols "nativo" {
@@ -160,8 +155,8 @@ xkb_symbols "nativo" {
     key <AB04> { [            b,               B,           apostrophe,         quotedbl ] };
     key <AB05> { [            k,               K,             currency,        brokenbar ] };
     key <AB06> { [            q,               Q,           0x01000259,       0x0100018F ] };
-    key <AB07> { [            v,               V,   doublelowquotemark, singlelowquotemark ] };
-    key <AB08> { [            g,               G,  leftdoublequotemark, leftsinglequotemark ] };
+    key <AB07> { [            v,               V,   doublelowquotemark,   singlelowquotemark ] };
+    key <AB08> { [            g,               G,  leftdoublequotemark,  leftsinglequotemark ] };
     key <AB09> { [            f,               F, rightdoublequotemark, rightsinglequotemark ] };
     key <AB10> { [            z,               Z,           0x0100201F,       0x0100201B ] };
 
@@ -169,51 +164,45 @@ xkb_symbols "nativo" {
 
 // Configures the use of the AltGr key
     include "level3(ralt_switch)"
-
 };
 
 
 //
-// Teclado Nativo Portugues para o teclado estadunidense   2005-07-19
-// Portuguese Nativo Keyboard for USA keyboards
+// Portuguese Nativo layout for US keyboards.
 //
-// Ari Caldeira     ari@tecladobrasileiro.com.br
+// Ari Caldeira    <ari@tecladobrasileiro.com.br>    2005-07-19
 //
 partial alphanumeric_keys
 xkb_symbols "nativo-us" {
+
     include "pt(nativo)"
 
     name[Group1]="Portuguese (Nativo for US keyboards)";
 
-// Lower row
     key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
     key <AB02> { [ guillemotleft, guillemotright,           0x01002039,       0x0100203A ] };
-
 };
 
 
 //
-// Teclado Nativo Portugues para digitacao em Esperanto    2005-07-19
-// Portuguese Nativo Keyboard for typing Esperanto
+// Portuguese Nativo layout for typing Esperanto.
 //
-// Ari Caldeira     ari@tecladobrasileiro.com.br
+// Ari Caldeira    <ari@tecladobrasileiro.com.br>    2005-07-19
 //
 partial alphanumeric_keys
 xkb_symbols "nativo-epo" {
+
     include "pt(nativo)"
 
     name[Group1]="Esperanto (Portugal, Nativo)";
 
-// Upper row Esperanto
     key <AD04> { [            h,               H,          hcircumflex,      Hcircumflex ] };
     key <AD05> { [  ccircumflex,     Ccircumflex,                    x,                X ] };
     key <AD06> { [       ubreve,          Ubreve,                    w,                W ] };
 
-// Lower row Esperanto
     key <AB01> { [  jcircumflex,     Jcircumflex,                    y,                Y ] };
     key <AB02> { [  scircumflex,     Scircumflex,             ccedilla,         Ccedilla ] };
     key <AB06> { [  gcircumflex,     Gcircumflex,                    q,                Q ] };
-
 };
 
 // EXTRAS: