Merge remote-tracking branch 'origin/released'

Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mapi/glapi/glapi_nop.c mesalib/src/mesa/main/bufferobj.c
author: marha <marha@users.sourceforge.net> 2015-03-22 14:10:47 +0100
committer: marha <marha@users.sourceforge.net> 2015-03-22 14:10:47 +0100
commit: 3bc24b271f45f9f33484b8cf53b44f33f7e8a237 (patch)
tree: 193651a94adb3804e800747e993d07b92688e4d4
parent: c646056120fe14e4c4ccf81bac5d78d61225a8e8 (diff)
parent: 82c8df11062f72a7d467e26cedbbd8b322ff7a70 (diff)
download: vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.gz
vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.bz2
vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.zip
160 files changed, 8407 insertions, 6044 deletions
diff --git a/X11/extensions/randrproto.txt b/X11/extensions/randrproto.txt
index 864268e5d..190048299 100644
--- a/X11/extensions/randrproto.txt
+++ b/X11/extensions/randrproto.txt
@@ -1,6 +1,6 @@
 	       The X Resize, Rotate and Reflect Extension
-			     Version 1.4.0
-			       2012-07-03
+			     Version 1.4.1
+			       2015-03-14
 
 			      Jim Gettys
 			   Jim.Gettys@hp.com
diff --git a/filesthatshouldbethesame.py b/filesthatshouldbethesame.py
index cf299a9b1..9f8b4f7f4 100755
--- a/filesthatshouldbethesame.py
+++ b/filesthatshouldbethesame.py
@@ -90,6 +90,7 @@ xorg-server/hw/xwin/glx/wglext.h                  mesalib/include/GL/wglext.h
 
 mesalib/src/mapi/glapi/glapi.h                      xorg-server/glx/glapi.h
 mesalib/src/mapi/glapi/gen/glapitable.h             mesalib/src/mesa/main/glapitable.h
+mesalib/src/util/macros.h                           xorg-server/glx/util/macros.h
 mesalib/src/mesa/main/glapitable.h                  xorg-server/glx/glapitable.h
 mesalib/src/mapi/glapi/gen/glprocs.h                xorg-server/glx/glprocs.h
 mesalib/src/mapi/glapi/gen/dispatch.h               xorg-server/glx/dispatch.h
diff --git a/fontconfig/README b/fontconfig/README
index 6ac164469..4a4dc307b 100644
--- a/fontconfig/README
+++ b/fontconfig/README
@@ -1,12 +1,45 @@
                               Fontconfig
              Font configuration and customization library
-                      Version 2.11.92 (2.12 RC2)
-                              2015-01-13
+                      Version 2.11.93 (2.12 RC3)
+                              2015-03-09
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.11.93 (2.12 RC3)
+
+Akira TAGOH (18):
+      Fix a typo in docs
+      Add pkg.m4 to git
+      Fix a build fail on some non-POSIX platforms
+      ifdef'd the unnecessary code for win32
+      Fix pointer cast warning on win32
+      filter can be null
+      Copy the real size of struct dirent
+      Rework again to copy the struct dirent
+      Hardcode the blanks in the library
+      Update the script to recognize the escaped space
+      Fix a build issue when $(srcdir) != $(builddir)
+      Don't add FC_LANG when it has "und"
+      Fix the array allocation
+      Improve the performance on searching blanks
+      Fix a segfault when OOM happened.
+      Fix a bug in the previous change forFcBlanksIsMember()
+      Fix an infinite loop in FcBlanksIsMember()
+      Fix a trivial bug for dist
+
+Alan Coopersmith (1):
+      Fix configure to work with Solaris Studio compilers
+
+Behdad Esfahbod (3):
+      Fix symbol cmap handling
+      Remove dead code after previous commit
+      Simplify some more
+
+Michael Haubenwallner (1):
+      Ensure config.h is included first, bug#89336.
+
 2.11.92 (2.12 RC2)
 
 Akira TAGOH (1):
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac
index 8f0150ef5..bb9880487 100644
--- a/fontconfig/configure.ac
+++ b/fontconfig/configure.ac
@@ -33,7 +33,7 @@ dnl This is the package version number, not the shared library
 dnl version.  This same version number must appear in fontconfig/fontconfig.h
 dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
 dnl not possible to extract the version number here from fontconfig.h
-AC_INIT([fontconfig], [2.11.92], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.11.93], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
 AM_INIT_AUTOMAKE([1.11 parallel-tests dist-bzip2])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
@@ -73,11 +73,11 @@ dnl libtool versioning
 dnl bump revision when fixing bugs
 dnl bump current and age, reset revision to zero when adding APIs
 dnl bump current, leave age, reset revision to zero when changing/removing APIS
-LIBT_CURRENT=9
+LIBT_CURRENT=10
 LIBT_REVISION=0
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
-LIBT_AGE=8
+LIBT_AGE=9
 
 LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
 AC_SUBST(LIBT_VERSION_INFO)
diff --git a/fontconfig/fc-blanks/Makefile.am b/fontconfig/fc-blanks/Makefile.am
index 5b9700031..e9de1fe16 100644
--- a/fontconfig/fc-blanks/Makefile.am
+++ b/fontconfig/fc-blanks/Makefile.am
@@ -32,6 +32,7 @@ $(BLANKS_H): $(TMPL) $(BLANKSPY)
 	mv $(BLANKS_H).tmp $(BLANKS_H) || ($(RM) $(BLANKS_H).tmp && false)
 
 EXTRA_DIST = 		\
+	$(BLANKSPY)	\
 	$(BLANKS_H)	\
 	$(TMPL)		\
 	$(NULL)
diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h
index 600ed6881..b14c9616c 100644
--- a/fontconfig/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig/fontconfig.h
@@ -52,7 +52,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	11
-#define FC_REVISION	92
+#define FC_REVISION	93
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
diff --git a/fontconfig/src/fcblanks.c b/fontconfig/src/fcblanks.c
index f163a8f40..5132a510f 100644
--- a/fontconfig/src/fcblanks.c
+++ b/fontconfig/src/fcblanks.c
@@ -93,8 +93,7 @@ FcBlanksIsMember (FcBlanks *b, FcChar32 ucs4)
 	middle = (lower + higher) / 2;
 	if (b->blanks[middle] == ucs4)
 	    return FcTrue;
-	if (middle == lower ||
-	    middle == higher)
+	if (lower >= higher)
 	    break;
 	if (b->blanks[middle] < ucs4)
 	    lower = middle + 1;
diff --git a/fontconfig/src/fcinit.c b/fontconfig/src/fcinit.c
index db62c21f2..6134ed40d 100644
--- a/fontconfig/src/fcinit.c
+++ b/fontconfig/src/fcinit.c
@@ -209,6 +209,8 @@ FcInitBringUptoDate (void)
     FcConfig	*config = FcConfigGetCurrent ();
     time_t	now;
 
+    if (!config)
+	return FcFalse;
     /*
      * rescanInterval == 0 disables automatic up to date
      */
diff --git a/libX11/configure.ac b/libX11/configure.ac
index 047917dd8..92b791c29 100644
--- a/libX11/configure.ac
+++ b/libX11/configure.ac
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libX11], [1.6.2],
+AC_INIT([libX11], [1.6.3],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
diff --git a/libXdmcp/configure.ac b/libXdmcp/configure.ac
index d117aa1e7..608bab99e 100644
--- a/libXdmcp/configure.ac
+++ b/libXdmcp/configure.ac
@@ -22,7 +22,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libXdmcp], [1.1.1],
+AC_INIT([libXdmcp], [1.1.2],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXdmcp])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
diff --git a/libxcb/src/c_client.py b/libxcb/src/c_client.py
index e78fd7755..6cce43f37 100755
--- a/libxcb/src/c_client.py
+++ b/libxcb/src/c_client.py
@@ -1,12 +1,9 @@
 #!/usr/bin/env python
-from xml.etree.cElementTree import *
-from os.path import basename
-from functools import reduce
+from __future__ import print_function
 import getopt
 import os
 import sys
 import errno
-import time
 import re
 
 # Jump to the bottom of this file for the main routine
@@ -530,7 +527,6 @@ def _c_type_setup(self, name, postfix):
                 if not module.namespace.is_ext or self.name[:2] == module.namespace.prefix:
                     finished_sizeof.append(self.c_sizeof_name)
                     _c_serialize('sizeof', self)
-# _c_type_setup()
 
 # Functions for querying field properties
 def _c_field_needs_list_accessor(field):
@@ -591,7 +587,6 @@ def _c_helper_fieldaccess_expr(prefix, field=None):
             prefix_str += last_sep + _cpp(field.field_name)
 
     return prefix_str
-# _c_absolute_name
 
 def _c_helper_field_mapping(complex_type, prefix, flat=False):
     """
@@ -607,7 +602,7 @@ def _c_helper_field_mapping(complex_type, prefix, flat=False):
             else:
                 bitcase_prefix = prefix
 
-            if (True==flat and not b.type.has_name) or False==flat:
+            if (flat and not b.type.has_name) or not flat:
                 all_fields.update(_c_helper_field_mapping(b.type, bitcase_prefix, flat))
     else:
         for f in complex_type.fields:
@@ -616,7 +611,7 @@ def _c_helper_field_mapping(complex_type, prefix, flat=False):
                 raise Exception("field name %s has been registered before" % f.field_name)
 
             all_fields[f.field_name] = (fname, f)
-            if f.type.is_container and flat==False:
+            if f.type.is_container and not flat:
                 if f.type.is_case_or_bitcase and not f.type.has_name:
                     new_prefix = prefix
                 elif f.type.is_switch and len(f.type.parents)>1:
@@ -627,7 +622,6 @@ def _c_helper_field_mapping(complex_type, prefix, flat=False):
                 all_fields.update(_c_helper_field_mapping(f.type, new_prefix, flat))
 
     return all_fields
-# _c_field_mapping()
 
 def _c_helper_resolve_field_names (prefix):
     """
@@ -648,7 +642,6 @@ def _c_helper_resolve_field_names (prefix):
         all_fields.update(_c_helper_field_mapping(obj, tmp_prefix, flat=True))
 
     return all_fields
-# _c_helper_resolve_field_names
 
 def get_expr_fields(self):
     """
@@ -693,13 +686,12 @@ def get_expr_fields(self):
         prefix.append(('', '', self))
 
     all_fields = _c_helper_resolve_field_names (prefix)
-    resolved_fields_names = list(filter(lambda x: x in all_fields.keys(), unresolved_fields_names))
+    resolved_fields_names = [x for x in unresolved_fields_names if x in all_fields]
     if len(unresolved_fields_names) != len(resolved_fields_names):
         raise Exception("could not resolve all fields for %s" % self.name)
 
     resolved_fields = [all_fields[n][1] for n in resolved_fields_names]
     return resolved_fields
-# get_expr_fields()
 
 def resolve_expr_fields(complex_obj):
     """
@@ -722,7 +714,6 @@ def resolve_expr_fields(complex_obj):
         if e not in all_fields and e not in unresolved:
             unresolved.append(e)
     return unresolved
-# resolve_expr_fields()
 
 def resolve_expr_fields_list(self, parents):
     """
@@ -826,7 +817,6 @@ def get_serialize_params(context, self, buffer_var='_buffer', aux_var='_aux'):
                 add_param(params, (p.c_field_const_type, '*', p.c_field_name))
 
     return (param_fields, wire_fields, params)
-# get_serialize_params()
 
 def _c_serialize_helper_insert_padding(context, code_lines, space, postpone, is_case_or_bitcase):
     code_lines.append('%s    /* insert padding */' % space)
@@ -837,7 +827,6 @@ def _c_serialize_helper_insert_padding(context, code_lines, space, postpone, is_
     else:
         code_lines.append(
             '%s    xcb_pad = -xcb_block_len & (xcb_align_to - 1);' % space)
-#    code_lines.append('%s    printf("automatically inserting padding: %%%%d\\n", xcb_pad);' % space)
     code_lines.append('%s    xcb_buffer_len += xcb_block_len + xcb_pad;' % space)
 
     if not postpone:
@@ -859,7 +848,6 @@ def _c_serialize_helper_insert_padding(context, code_lines, space, postpone, is_
 
     # keep tracking of xcb_parts entries for serialize
     return 1
-# _c_serialize_helper_insert_padding()
 
 def _c_serialize_helper_switch(context, self, complex_name,
                                code_lines, temp_vars,
@@ -912,14 +900,12 @@ def _c_serialize_helper_switch(context, self, complex_name,
 #        code_lines.append('%s    xcb_buffer_len += xcb_block_len + xcb_pad;' % space)
 
     return count
-# _c_serialize_helper_switch
 
 def _c_serialize_helper_switch_field(context, self, field, c_switch_variable, prefix):
     """
     handle switch by calling _serialize() or _unpack(), depending on context
     """
     # switch is handled by this function as a special case
-    param_fields, wire_fields, params = get_serialize_params(context, self)
     field_mapping = _c_helper_field_mapping(self, prefix)
     prefix_str = _c_helper_fieldaccess_expr(prefix)
 
@@ -956,7 +942,6 @@ def _c_serialize_helper_switch_field(context, self, field, c_switch_variable, pr
         length = "%s(xcb_tmp, %s)" % (field.type.c_sizeof_name, my_c_field_names)
 
     return length
-# _c_serialize_helper_switch_field()
 
 def _c_get_additional_type_params(type):
     """
@@ -980,8 +965,8 @@ def _c_serialize_helper_list_field(context, self, field,
     param_names = [p[2] for p in params]
 
     expr_fields_names = [f.field_name for f in get_expr_fields(field.type)]
-    resolved = list(filter(lambda x: x in param_names, expr_fields_names))
-    unresolved = list(filter(lambda x: x not in param_names, expr_fields_names))
+    resolved = [x for x in expr_fields_names if x in param_names]
+    unresolved = [x for x in expr_fields_names if x not in param_names]
 
     field_mapping = {}
     for r in resolved:
@@ -994,8 +979,8 @@ def _c_serialize_helper_list_field(context, self, field,
                             field.c_field_name)
 
         field_mapping.update(_c_helper_resolve_field_names(prefix))
-        resolved += list(filter(lambda x: x in field_mapping, unresolved))
-        unresolved = list(filter(lambda x: x not in field_mapping, unresolved))
+        resolved += [x for x in unresolved if x in field_mapping]
+        unresolved = [x for x in unresolved if x not in field_mapping]
         if len(unresolved)>0:
             raise Exception('could not resolve the length fields required for list %s' % field.c_field_name)
 
@@ -1041,7 +1026,6 @@ def _c_serialize_helper_list_field(context, self, field,
             code_lines.append('%s    xcb_block_len = xcb_parts[xcb_parts_idx].iov_len;' % space)
 
     return length
-# _c_serialize_helper_list_field()
 
 def _c_serialize_helper_fields_fixed_size(context, self, field,
                                           code_lines, temp_vars,
@@ -1051,7 +1035,7 @@ def _c_serialize_helper_fields_fixed_size(context, self, field,
         code_lines.append('%s    /* %s.%s */' % (space, self.c_type, field.c_field_name))
     else:
         scoped_name = [p[2].c_type if idx==0 else p[0] for idx, p in enumerate(prefix)]
-        typename = reduce(lambda x,y: "%s.%s" % (x, y), scoped_name)
+        typename = ".".join(scoped_name)
         code_lines.append('%s    /* %s.%s */' % (space, typename, field.c_field_name))
 
     abs_field_name = _c_helper_fieldaccess_expr(prefix, field)
@@ -1111,7 +1095,6 @@ def _c_serialize_helper_fields_fixed_size(context, self, field,
                 length = '%d' % field.type.nmemb
 
     return (value, length)
-# _c_serialize_helper_fields_fixed_size()
 
 def _c_serialize_helper_fields_variable_size(context, self, field,
                                              code_lines, temp_vars,
@@ -1164,7 +1147,6 @@ def _c_serialize_helper_fields_variable_size(context, self, field,
         length = "%s(%s)" % (field.type.c_sizeof_name, var_field_name)
 
     return (value, length)
-# _c_serialize_helper_fields_variable_size
 
 def _c_serialize_helper_fields(context, self,
                                code_lines, temp_vars,
@@ -1266,7 +1248,6 @@ def _c_serialize_helper_fields(context, self,
     _c_pre.pop_indent()
 
     return count
-# _c_serialize_helper_fields()
 
 def _c_serialize_helper(context, complex_type,
                         code_lines, temp_vars,
@@ -1306,7 +1287,6 @@ def _c_serialize_helper(context, complex_type,
     count += _c_serialize_helper_insert_padding(context, code_lines, space, False, self.is_switch)
 
     return count
-# _c_serialize_helper()
 
 def _c_serialize(context, self):
     """
@@ -1340,8 +1320,7 @@ def _c_serialize(context, self):
         if not field.type.fixed_size() or self.is_switch:
             variable_size_fields += 1
     # determine maxtypelen
-    for p in params:
-        maxtypelen = max(maxtypelen, len(p[0]) + len(p[1]))
+    maxtypelen = max(len(p[0]) + len(p[1]) for p in params)
 
     # write to .c/.h
     indent = ' '*(len(func_name)+2)
@@ -1352,7 +1331,7 @@ def _c_serialize(context, self):
         param_str.append("%s%s%s  %s%s  /**< */" % (indent, typespec, spacing, pointerspec, field_name))
     # insert function name
     param_str[0] = "%s (%s" % (func_name, param_str[0].strip())
-    param_str = list(map(lambda x: "%s," % x, param_str))
+    param_str = ["%s," % x for x in param_str]
     for s in param_str[:-1]:
         _hc(s)
     _h("%s);" % param_str[-1].rstrip(','))
@@ -1408,13 +1387,13 @@ def _c_serialize(context, self):
         if self.is_switch:
             # switch: call _unpack()
             _c('    %s _aux;', self.c_type)
-            _c('    return %s(%s, &_aux);', self.c_unpack_name, reduce(lambda x,y: "%s, %s" % (x, y), param_names))
+            _c('    return %s(%s, &_aux);', self.c_unpack_name, ", ".join(param_names))
             _c('}')
             _c_pre.redirect_end()
             return
         elif self.c_var_followed_by_fixed_fields:
             # special case: call _unserialize()
-            _c('    return %s(%s, NULL);', self.c_unserialize_name, reduce(lambda x,y: "%s, %s" % (x, y), param_names))
+            _c('    return %s(%s, NULL);', self.c_unserialize_name, ", ".join(param_names))
             _c('}')
             _c_pre.redirect_end()
             return
@@ -1441,7 +1420,7 @@ def _c_serialize(context, self):
         if not (self.is_switch or self.c_var_followed_by_fixed_fields):
 
             # look if we have to declare an '_aux' variable at all
-            if len(list(filter(lambda x: x.find('_aux')!=-1, code_lines)))>0:
+            if any('_aux' in x for x in code_lines):
                 if not self.c_var_followed_by_fixed_fields:
                     _c('    const %s *_aux = (%s *)_buffer;', self.c_type, self.c_type)
                 else:
@@ -1515,7 +1494,6 @@ def _c_serialize(context, self):
     _c('')
     _c('    return xcb_buffer_len;')
     _c('}')
-# _c_serialize()
 
 def _c_iterator_get_end(field, accum):
     '''
@@ -1673,7 +1651,6 @@ def _c_accessor_get_expr(expr, field_mapping):
         return c_name
     elif expr.op == 'sumof':
         # locate the referenced list object
-        list_obj = expr.lenfield_type
         field = None
         for f in expr.lenfield_parent.fields:
             if f.field_name == expr.lenfield_name:
@@ -1814,14 +1791,13 @@ def _c_accessors_list(self, field):
     '''
 
     def get_align_pad(field):
-            prev = field.prev_varsized_field
-            prev_prev = field.prev_varsized_field.prev_varsized_field
-
-            if (prev.type.is_pad and prev.type.align > 0 and prev_prev is not None):
-                return (prev_prev, '((-prev.index) & (%d - 1))' % prev.type.align)
-            else:
-                return (prev, None)
+        prev = field.prev_varsized_field
+        prev_prev = field.prev_varsized_field.prev_varsized_field
 
+        if prev.type.is_pad and prev.type.align > 0 and prev_prev is not None:
+            return (prev_prev, '((-prev.index) & (%d - 1))' % prev.type.align)
+        else:
+            return (prev, None)
 
     list = field.type
     c_type = self.c_type
@@ -1858,8 +1834,7 @@ def _c_accessors_list(self, field):
         fields.update(_c_helper_field_mapping(toplevel_switch, [('S', '->', toplevel_switch)], flat=True))
 
         # initialize prefix for everything "below" S
-        prefix_str = '/* %s */ S' % toplevel_switch.name[-1]
-        prefix = [(prefix_str, '->', toplevel_switch)]
+        prefix = [('S', '->', toplevel_switch)]
 
         # look for fields in the remaining containers
         for p in parents[2:] + [self]:
@@ -2072,12 +2047,8 @@ def _c_complex(self, force_packed = False):
     struct_fields = []
     maxtypelen = 0
 
-    varfield = None
     for field in self.fields:
-        if not field.type.fixed_size() and not self.is_switch and not self.is_union:
-            varfield = field.c_field_name
-            continue
-        if field.wire:
+        if field.wire and (field.type.fixed_size() or self.is_switch or self.is_union):
             struct_fields.append(field)
 
     for field in struct_fields:
@@ -2131,7 +2102,7 @@ def c_union(self, name):
     _c_complex(self)
     _c_iterator(self, name)
 
-def _c_request_helper(self, name, cookie_type, void, regular, aux=False, reply_fds=False):
+def _c_request_helper(self, name, void, regular, aux=False, reply_fds=False):
     '''
     Declares a request function.
     '''
@@ -2269,7 +2240,7 @@ def _c_request_helper(self, name, cookie_type, void, regular, aux=False, reply_f
         _h(' * placed in the event queue.')
     _h(' */')
     _c('')
-    _hc('%s', cookie_type)
+    _hc('%s', func_cookie)
 
     spacing = ' ' * (maxtypelen - len('xcb_connection_t'))
     comma = ',' if len(param_fields) else ');'
@@ -2306,10 +2277,10 @@ def _c_request_helper(self, name, cookie_type, void, regular, aux=False, reply_f
 
     _c('{')
     _c('    static const xcb_protocol_request_t xcb_req = {')
-    _c('        /* count */ %d,', count)
-    _c('        /* ext */ %s,', func_ext_global)
-    _c('        /* opcode */ %s,', self.c_request_name.upper())
-    _c('        /* isvoid */ %d', 1 if void else 0)
+    _c('        .count = %d,', count)
+    _c('        .ext = %s,', func_ext_global)
+    _c('        .opcode = %s,', self.c_request_name.upper())
+    _c('        .isvoid = %d', 1 if void else 0)
     _c('    };')
     _c('')
 
@@ -2329,8 +2300,6 @@ def _c_request_helper(self, name, cookie_type, void, regular, aux=False, reply_f
         _c('    unsigned int xcb_tmp_len;')
         _c('    char *xcb_tmp;')
     _c('')
-    # simple request call tracing
-#    _c('    printf("in function %s\\n");' % func_name)
 
     # fixed size fields
     for field in wire_fields:
@@ -2352,7 +2321,7 @@ def _c_request_helper(self, name, cookie_type, void, regular, aux=False, reply_f
         serialize_args = get_serialize_params(context, type_obj,
                                               c_field_name,
                                               aux_var)[2]
-        return reduce(lambda x,y: "%s, %s" % (x,y), [a[2] for a in serialize_args])
+        return ", ".join(a[2] for a in serialize_args)
 
     # calls in order to free dyn. all. memory
     free_calls = []
@@ -2380,7 +2349,6 @@ def _c_request_helper(self, name, cookie_type, void, regular, aux=False, reply_f
                         else:
                             list_length = _c_accessor_get_expr(field.type.expr, None)
 
-                            length = ''
                             _c("    xcb_parts[%d].iov_len = 0;" % count)
                             _c("    xcb_tmp = (char *)%s;", field.c_field_name)
                             _c("    for(i=0; i<%s; i++) {" % list_length)
@@ -2527,10 +2495,7 @@ def _c_reply(self, name):
     _c('}')
 
 def _c_reply_has_fds(self):
-    for field in self.fields:
-        if field.isfd:
-            return True
-    return False
+    return any(field.isfd for field in self.fields)
 
 def _c_reply_fds(self, name):
     '''
@@ -2582,7 +2547,7 @@ def _c_cookie(self, name):
     _h('    unsigned int sequence; /**<  */')
     _h('} %s;', self.c_cookie_type)
 
-def _man_request(self, name, cookie_type, void, aux):
+def _man_request(self, name, void, aux):
     param_fields = [f for f in self.fields if f.visible]
 
     func_name = self.c_request_name if not aux else self.c_aux_name
@@ -2628,7 +2593,8 @@ def _man_request(self, name, cookie_type, void, aux):
     f.write('.SS Request function\n')
     f.write('.HP\n')
     base_func_name = self.c_request_name if not aux else self.c_aux_name
-    f.write('%s \\fB%s\\fP(xcb_connection_t\\ *\\fIconn\\fP, %s\n' % (cookie_type, base_func_name, prototype))
+    func_cookie = 'xcb_void_cookie_t' if void else self.c_cookie_type
+    f.write('%s \\fB%s\\fP(xcb_connection_t\\ *\\fIconn\\fP, %s\n' % (func_cookie, base_func_name, prototype))
     create_link('%s_%s' % (base_func_name, ('checked' if void else 'unchecked')))
     if not void:
         f.write('.PP\n')
@@ -2675,8 +2641,7 @@ def _man_request(self, name, cookie_type, void, aux):
                 for field in b.type.fields:
                     _c_complex_field(self, field, space)
                 if b.type.has_name:
-                    print >> sys.stderr, 'ERROR: New unhandled documentation case'
-                    pass
+                    print('ERROR: New unhandled documentation case\n', file=sys.stderr)
 
         f.write('} \\fB%s\\fP;\n' % self.reply.c_type)
         f.write('.fi\n')
@@ -2745,8 +2710,6 @@ def _man_request(self, name, cookie_type, void, aux):
             # 'R': parents[0] is always the 'toplevel' container type
             params.append(('const %s *\\fIreply\\fP' % parents[0].c_type, parents[0]))
             fields.update(_c_helper_field_mapping(parents[0], [('R', '->', parents[0])], flat=True))
-            # auxiliary object for 'R' parameters
-            R_obj = parents[0]
 
             if switch_obj is not None:
                 # now look where the fields are defined that are needed to evaluate
@@ -2759,8 +2722,7 @@ def _man_request(self, name, cookie_type, void, aux):
                 fields.update(_c_helper_field_mapping(toplevel_switch, [('S', '->', toplevel_switch)], flat=True))
 
                 # initialize prefix for everything "below" S
-                prefix_str = '/* %s */ S' % toplevel_switch.name[-1]
-                prefix = [(prefix_str, '->', toplevel_switch)]
+                prefix = [('S', '->', toplevel_switch)]
 
                 # look for fields in the remaining containers
                 for p in parents[2:] + [self]:
@@ -2770,9 +2732,6 @@ def _man_request(self, name, cookie_type, void, aux):
                         prefix.append((p.name[-1], '.', p))
                     fields.update(_c_helper_field_mapping(p, prefix, flat=True))
 
-                # auxiliary object for 'S' parameter
-                S_obj = parents[1]
-
             if list.member.fixed_size():
                 idx = 1 if switch_obj is not None else 0
                 f.write('.HP\n')
@@ -2931,7 +2890,7 @@ def _man_request(self, name, cookie_type, void, aux):
                  'handle errors in the event loop instead, use '
                  '\\fI%s_unchecked\\fP. See \\fBxcb-requests(%s)\\fP for '
                  'details.\n') %
-                (cookie_type, self.c_reply_name, base_func_name, section))
+                (self.c_cookie_type, self.c_reply_name, base_func_name, section))
     f.write('.SH ERRORS\n')
     if hasattr(self, "doc") and self.doc:
         for errtype, errtext in sorted(self.doc.errors.items()):
@@ -3013,7 +2972,7 @@ def _man_event(self, name):
             spacing = ' ' * (maxtypelen - len(field.c_field_type))
             f.write('%s    %s%s \\fI%s\\fP%s;\n' % (space, field.c_field_type, spacing, field.c_field_name, field.c_subscript))
         else:
-            print >> sys.stderr, 'ERROR: New unhandled documentation case'
+            print('ERROR: New unhandled documentation case', file=sys.stderr)
 
     if not self.is_switch:
         for field in struct_fields:
@@ -3026,7 +2985,7 @@ def _man_event(self, name):
             for field in b.type.fields:
                 _c_complex_field(self, field, space)
             if b.type.has_name:
-                print >> sys.stderr, 'ERROR: New unhandled documentation case'
+                print('ERROR: New unhandled documentation case', file=sys.stderr)
                 pass
 
     f.write('} \\fB%s\\fP;\n' % self.c_type)
@@ -3121,11 +3080,11 @@ def c_request(self, name):
         _c_complex(self.reply)
         # Request prototypes
         has_fds = _c_reply_has_fds(self.reply)
-        _c_request_helper(self, name, self.c_cookie_type, False, True, False, has_fds)
-        _c_request_helper(self, name, self.c_cookie_type, False, False, False, has_fds)
+        _c_request_helper(self, name, void=False, regular=True, aux=False, reply_fds=has_fds)
+        _c_request_helper(self, name, void=False, regular=False, aux=False, reply_fds=has_fds)
         if self.c_need_aux:
-            _c_request_helper(self, name, self.c_cookie_type, False, True, True, has_fds)
-            _c_request_helper(self, name, self.c_cookie_type, False, False, True, has_fds)
+            _c_request_helper(self, name, void=False, regular=True, aux=True, reply_fs=has_fds)
+            _c_request_helper(self, name, void=False, regular=False, aux=True, reply_fs=has_fds)
         # Reply accessors
         _c_accessors(self.reply, name + ('reply',), name)
         _c_reply(self, name)
@@ -3133,17 +3092,16 @@ def c_request(self, name):
             _c_reply_fds(self, name)
     else:
         # Request prototypes
-        _c_request_helper(self, name, 'xcb_void_cookie_t', True, False)
-        _c_request_helper(self, name, 'xcb_void_cookie_t', True, True)
+        _c_request_helper(self, name, void=True, regular=False)
+        _c_request_helper(self, name, void=True, regular=True)
         if self.c_need_aux:
-            _c_request_helper(self, name, 'xcb_void_cookie_t', True, False, True)
-            _c_request_helper(self, name, 'xcb_void_cookie_t', True, True, True)
+            _c_request_helper(self, name, void=True, regular=False, aux=True)
+            _c_request_helper(self, name, void=True, regular=True, aux=True)
         _c_accessors(self, name, name)
 
     # We generate the manpage afterwards because _c_type_setup has been called.
     # TODO: what about aux helpers?
-    cookie_type = self.c_cookie_type if self.reply else 'xcb_void_cookie_t'
-    _man_request(self, name, cookie_type, not self.reply, False)
+    _man_request(self, name, void=not self.reply, aux=False)
 
 def c_event(self, name):
     '''
diff --git a/mesalib/autogen.sh b/mesalib/autogen.sh
index 626d21334..c8960971d 100644
--- a/mesalib/autogen.sh
+++ b/mesalib/autogen.sh
@@ -6,8 +6,8 @@ test -z "$srcdir" && srcdir=.
 ORIGDIR=`pwd`
 cd "$srcdir"
 
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
+autoreconf --force --verbose --install || exit 1
+cd "$ORIGDIR" || exit $?
 
 if test -z "$NOCONFIGURE"; then
     "$srcdir"/configure "$@"
diff --git a/mesalib/common.py b/mesalib/common.py
index 1d2d586a8..7a939417e 100644
--- a/mesalib/common.py
+++ b/mesalib/common.py
@@ -26,28 +26,28 @@ else:
     target_platform = host_platform
 
 _machine_map = {
-	'x86': 'x86',
-	'i386': 'x86',
-	'i486': 'x86',
-	'i586': 'x86',
-	'i686': 'x86',
-	'BePC': 'x86',
-	'Intel': 'x86',
-	'ppc' : 'ppc',
-	'BeBox': 'ppc',
-	'BeMac': 'ppc',
-	'AMD64': 'x86_64',
-	'x86_64': 'x86_64',
-	'sparc': 'sparc',
-	'sun4u': 'sparc',
+    'x86': 'x86',
+    'i386': 'x86',
+    'i486': 'x86',
+    'i586': 'x86',
+    'i686': 'x86',
+    'BePC': 'x86',
+    'Intel': 'x86',
+    'ppc': 'ppc',
+    'BeBox': 'ppc',
+    'BeMac': 'ppc',
+    'AMD64': 'x86_64',
+    'x86_64': 'x86_64',
+    'sparc': 'sparc',
+    'sun4u': 'sparc',
 }
 
 
 # find host_machine value
 if 'PROCESSOR_ARCHITECTURE' in os.environ:
-	host_machine = os.environ['PROCESSOR_ARCHITECTURE']
+    host_machine = os.environ['PROCESSOR_ARCHITECTURE']
 else:
-	host_machine = _platform.machine()
+    host_machine = _platform.machine()
 host_machine = _machine_map.get(host_machine, 'generic')
 
 default_machine = host_machine
@@ -65,7 +65,8 @@ else:
     default_llvm = 'no'
     try:
         if target_platform != 'windows' and \
-           subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
+           subprocess.call(['llvm-config', '--version'],
+                           stdout=subprocess.PIPE) == 0:
             default_llvm = 'yes'
     except:
         pass
@@ -75,30 +76,38 @@ else:
 # Common options
 
 def AddOptions(opts):
-	try:
-		from SCons.Variables.BoolVariable import BoolVariable as BoolOption
-	except ImportError:
-		from SCons.Options.BoolOption import BoolOption
-	try:
-		from SCons.Variables.EnumVariable import EnumVariable as EnumOption
-	except ImportError:
-		from SCons.Options.EnumOption import EnumOption
-	opts.Add(EnumOption('build', 'build type', 'debug',
-	                  allowed_values=('debug', 'checked', 'profile', 'release')))
-	opts.Add(BoolOption('verbose', 'verbose output', 'no'))
-	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
-											 allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
-	opts.Add(EnumOption('platform', 'target platform', host_platform,
-											 allowed_values=('cygwin', 'darwin', 'freebsd', 'haiku', 'linux', 'sunos', 'windows')))
-	opts.Add(BoolOption('embedded', 'embedded build', 'no'))
-	opts.Add(BoolOption('analyze', 'enable static code analysis where available', 'no'))
-	opts.Add('toolchain', 'compiler toolchain', default_toolchain)
-	opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no'))
-	opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
-	opts.Add(BoolOption('openmp', 'EXPERIMENTAL: compile with openmp (swrast)', 'no'))
-	opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
-	opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
-	opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes'))
-	opts.Add(BoolOption('texture_float', 'enable floating-point textures and renderbuffers', 'no'))
-	if host_platform == 'windows':
-		opts.Add('MSVC_VERSION', 'Microsoft Visual C/C++ version')
+    try:
+        from SCons.Variables.BoolVariable import BoolVariable as BoolOption
+    except ImportError:
+        from SCons.Options.BoolOption import BoolOption
+    try:
+        from SCons.Variables.EnumVariable import EnumVariable as EnumOption
+    except ImportError:
+        from SCons.Options.EnumOption import EnumOption
+    opts.Add(EnumOption('build', 'build type', 'debug',
+                        allowed_values=('debug', 'checked', 'profile',
+                                        'release')))
+    opts.Add(BoolOption('verbose', 'verbose output', 'no'))
+    opts.Add(EnumOption('machine', 'use machine-specific assembly code',
+                        default_machine,
+                        allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
+    opts.Add(EnumOption('platform', 'target platform', host_platform,
+                        allowed_values=('cygwin', 'darwin', 'freebsd', 'haiku',
+                                        'linux', 'sunos', 'windows')))
+    opts.Add(BoolOption('embedded', 'embedded build', 'no'))
+    opts.Add(BoolOption('analyze',
+                        'enable static code analysis where available', 'no'))
+    opts.Add('toolchain', 'compiler toolchain', default_toolchain)
+    opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support',
+                        'no'))
+    opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
+    opts.Add(BoolOption('openmp', 'EXPERIMENTAL: compile with openmp (swrast)',
+                        'no'))
+    opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
+    opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
+    opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes'))
+    opts.Add(BoolOption('texture_float',
+                        'enable floating-point textures and renderbuffers',
+                        'no'))
+    if host_platform == 'windows':
+        opts.Add('MSVC_VERSION', 'Microsoft Visual C/C++ version')
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index ad64df012..08378f570 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -46,6 +46,13 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([foreign tar-ustar dist-xz])
 
+dnl We only support native Windows builds (MinGW/MSVC) through SCons.
+case "$host_os" in
+mingw*)
+    AC_MSG_ERROR([MinGW build not supported through autoconf/automake, use SCons instead])
+    ;;
+esac
+
 # Support silent build rules, requires at least automake-1.11. Disable
 # by either passing --disable-silent-rules to configure or passing V=1
 # to make
@@ -61,7 +68,7 @@ AC_SUBST([OSMESA_VERSION])
 dnl Versions for external dependencies
 LIBDRM_REQUIRED=2.4.38
 LIBDRM_RADEON_REQUIRED=2.4.56
-LIBDRM_INTEL_REQUIRED=2.4.52
+LIBDRM_INTEL_REQUIRED=2.4.60
 LIBDRM_NVVIEUX_REQUIRED=2.4.33
 LIBDRM_NOUVEAU_REQUIRED="2.4.33 libdrm >= 2.4.41"
 LIBDRM_FREEDRENO_REQUIRED=2.4.57
@@ -79,6 +86,7 @@ XCBDRI2_REQUIRED=1.8
 XCBGLX_REQUIRED=1.8.1
 XSHMFENCE_REQUIRED=1.1
 XVMC_REQUIRED=1.0.6
+PYTHON_MAKO_REQUIRED=0.3.4
 
 dnl Check for progs
 AC_PROG_CPP
@@ -114,7 +122,12 @@ if test "x$INDENT" != "xcat"; then
     fi
 fi
 
-AX_CHECK_PYTHON_MAKO_MODULE(0.3.4)
+AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED)
+if test -n "$PYTHON2" -a "x$acv_mako_found" = "xyes"; then
+    AC_MSG_RESULT(yes)
+else
+    AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found])
+fi
 
 AC_PROG_INSTALL
 
@@ -189,6 +202,7 @@ AX_GCC_FUNC_ATTRIBUTE([flatten])
 AX_GCC_FUNC_ATTRIBUTE([format])
 AX_GCC_FUNC_ATTRIBUTE([malloc])
 AX_GCC_FUNC_ATTRIBUTE([packed])
+AX_GCC_FUNC_ATTRIBUTE([unused])
 
 AM_CONDITIONAL([GEN_ASM_OFFSETS], test "x$GEN_ASM_OFFSETS" = xyes)
 
@@ -271,8 +285,20 @@ if test "x$GCC" = xyes; then
     # - non-Linux/Posix OpenGL portions needs to build on MSVC 2013 (which
     #   supports most of C99)
     # - the rest has no compiler compiler restrictions
-    MSVC2013_COMPAT_CFLAGS="-Werror=vla -Werror=pointer-arith"
-    MSVC2013_COMPAT_CXXFLAGS="-Werror=vla -Werror=pointer-arith"
+    MSVC2013_COMPAT_CFLAGS="-Werror=pointer-arith"
+    MSVC2013_COMPAT_CXXFLAGS="-Werror=pointer-arith"
+
+    # Enable -Werror=vla if compiler supports it
+    save_CFLAGS="$CFLAGS"
+    AC_MSG_CHECKING([whether $CC supports -Werror=vla])
+    CFLAGS="$CFLAGS -Werror=vla"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+		   [MSVC2013_COMPAT_CFLAGS="$MSVC2013_COMPAT_CFLAGS -Werror=vla";
+		    MSVC2013_COMPAT_CXXFLAGS="$MSVC2013_COMPAT_CXXFLAGS -Werror=vla";
+		    AC_MSG_RESULT([yes])],
+		    AC_MSG_RESULT([no]));
+    CFLAGS="$save_CFLAGS"
+
     MSVC2008_COMPAT_CFLAGS="$MSVC2013_COMPAT_CFLAGS -Werror=declaration-after-statement"
     MSVC2008_COMPAT_CXXFLAGS="$MSVC2013_COMPAT_CXXFLAGS"
 fi
@@ -632,7 +658,7 @@ AC_CHECK_FUNCS([dladdr])
 LIBS="$save_LIBS"
 
 case "$host_os" in
-darwin*|mingw*)
+darwin*)
     ;;
 *)
     AC_CHECK_FUNCS([clock_gettime], [CLOCK_LIB=],
@@ -646,13 +672,10 @@ dnl See if posix_memalign is available
 AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
 
 dnl Check for pthreads
-case "$host_os" in
-mingw*)
-    ;;
-*)
-    AX_PTHREAD
-    ;;
-esac
+AX_PTHREAD
+if test "x$ax_pthread_ok" = xno; then
+    AC_MSG_ERROR([Building mesa on this platform requires pthreads])
+fi
 dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS
 dnl to -pthread, which causes problems if we need -lpthread to appear in
 dnl pkgconfig files.
@@ -883,7 +906,7 @@ AM_CONDITIONAL(HAVE_DRI_GLX, test "x$enable_glx" = xyes -a \
 case "$host_os" in
 darwin*)
     dri_platform='apple' ;;
-gnu*|mingw*|cygwin*)
+gnu*|cygwin*)
     dri_platform='none' ;;
 *)
     dri_platform='drm' ;;
@@ -1759,7 +1782,7 @@ for plat in $egl_platforms; do
 			AC_MSG_ERROR([EGL platform drm requires libdrm >= $LIBDRM_REQUIRED])
 		;;
 
-	android|fbdev|gdi|null)
+	android|gdi|null)
 		;;
 
 	*)
@@ -1788,7 +1811,6 @@ fi
 AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep -q 'x11')
 AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep -q 'wayland')
 AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep -q 'drm')
-AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep -q 'fbdev')
 AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep -q 'null')
 
 AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")
@@ -2347,7 +2369,6 @@ AC_CONFIG_FILES([Makefile
 		src/gallium/auxiliary/Makefile
 		src/gallium/auxiliary/pipe-loader/Makefile
 		src/gallium/drivers/freedreno/Makefile
-		src/gallium/drivers/galahad/Makefile
 		src/gallium/drivers/i915/Makefile
 		src/gallium/drivers/ilo/Makefile
 		src/gallium/drivers/llvmpipe/Makefile
@@ -2396,10 +2417,8 @@ AC_CONFIG_FILES([Makefile
 		src/gallium/winsys/radeon/drm/Makefile
 		src/gallium/winsys/svga/drm/Makefile
 		src/gallium/winsys/sw/dri/Makefile
-		src/gallium/winsys/sw/fbdev/Makefile
 		src/gallium/winsys/sw/kms-dri/Makefile
 		src/gallium/winsys/sw/null/Makefile
-		src/gallium/winsys/sw/wayland/Makefile
 		src/gallium/winsys/sw/wrapper/Makefile
 		src/gallium/winsys/sw/xlib/Makefile
 		src/gallium/winsys/vc4/drm/Makefile
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index 43bbf854e..93fa60d25 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -21,23 +21,23 @@ Feature                                               Status
 GL 3.0, GLSL 1.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe
 
   glBindFragDataLocation, glGetFragDataLocation         DONE
-  Conditional rendering (GL_NV_conditional_render)      DONE (r300, swrast)
-  Map buffer subranges (GL_ARB_map_buffer_range)        DONE (r300, swrast)
-  Clamping controls (GL_ARB_color_buffer_float)         DONE (r300)
-  Float textures, renderbuffers (GL_ARB_texture_float)  DONE (r300)
+  Conditional rendering (GL_NV_conditional_render)      DONE ()
+  Map buffer subranges (GL_ARB_map_buffer_range)        DONE ()
+  Clamping controls (GL_ARB_color_buffer_float)         DONE ()
+  Float textures, renderbuffers (GL_ARB_texture_float)  DONE ()
   GL_EXT_packed_float                                   DONE ()
-  GL_EXT_texture_shared_exponent                        DONE (swrast)
+  GL_EXT_texture_shared_exponent                        DONE ()
   Float depth buffers (GL_ARB_depth_buffer_float)       DONE ()
-  Framebuffer objects (GL_ARB_framebuffer_object)       DONE (r300, swrast)
+  Framebuffer objects (GL_ARB_framebuffer_object)       DONE ()
   GL_ARB_half_float_pixel                               DONE (all drivers)
-  GL_ARB_half_float_vertex                              DONE (r300, swrast)
+  GL_ARB_half_float_vertex                              DONE ()
   GL_EXT_texture_integer                                DONE ()
   GL_EXT_texture_array                                  DONE ()
-  Per-buffer blend and masks (GL_EXT_draw_buffers2)     DONE (swrast)
-  GL_EXT_texture_compression_rgtc                       DONE (r300, swrast)
-  GL_ARB_texture_rg                                     DONE (r300, swrast)
+  Per-buffer blend and masks (GL_EXT_draw_buffers2)     DONE ()
+  GL_EXT_texture_compression_rgtc                       DONE ()
+  GL_ARB_texture_rg                                     DONE ()
   Transform feedback (GL_EXT_transform_feedback)        DONE ()
-  Vertex array objects (GL_ARB_vertex_array_object)     DONE (all drivers)
+  Vertex array objects (GL_ARB_vertex_array_object)     DONE ()
   sRGB framebuffer format (GL_EXT_framebuffer_sRGB)     DONE ()
   glClearBuffer commands                                DONE
   glGetStringi command                                  DONE
@@ -45,7 +45,7 @@ GL 3.0, GLSL 1.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, soft
   glVertexAttribI commands                              DONE
   Depth format cube textures                            DONE ()
   GLX_ARB_create_context (GLX 1.4 is required)          DONE
-  Multisample anti-aliasing                             DONE (llvmpipe (*), softpipe (*), r300)
+  Multisample anti-aliasing                             DONE (llvmpipe (*), softpipe (*))
 
 (*) llvmpipe and softpipe have fake Multisample anti-aliasing support
 
@@ -53,28 +53,28 @@ GL 3.0, GLSL 1.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, soft
 GL 3.1, GLSL 1.40 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe
 
   Forward compatible context support/deprecations       DONE ()
-  Instanced drawing (GL_ARB_draw_instanced)             DONE (swrast)
-  Buffer copying (GL_ARB_copy_buffer)                   DONE (r300, swrast)
-  Primitive restart (GL_NV_primitive_restart)           DONE (r300)
+  Instanced drawing (GL_ARB_draw_instanced)             DONE ()
+  Buffer copying (GL_ARB_copy_buffer)                   DONE ()
+  Primitive restart (GL_NV_primitive_restart)           DONE ()
   16 vertex texture image units                         DONE ()
   Texture buffer objs (GL_ARB_texture_buffer_object)    DONE for OpenGL 3.1 contexts ()
-  Rectangular textures (GL_ARB_texture_rectangle)       DONE (r300, swrast)
-  Uniform buffer objs (GL_ARB_uniform_buffer_object)    DONE (swrast)
-  Signed normalized textures (GL_EXT_texture_snorm)     DONE (r300)
+  Rectangular textures (GL_ARB_texture_rectangle)       DONE ()
+  Uniform buffer objs (GL_ARB_uniform_buffer_object)    DONE ()
+  Signed normalized textures (GL_EXT_texture_snorm)     DONE ()
 
 
 GL 3.2, GLSL 1.50 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe
 
   Core/compatibility profiles                           DONE
   Geometry shaders                                      DONE ()
-  BGRA vertex order (GL_ARB_vertex_array_bgra)          DONE (r300, swrast)
-  Base vertex offset(GL_ARB_draw_elements_base_vertex)  DONE (r300, swrast)
-  Frag shader coord (GL_ARB_fragment_coord_conventions) DONE (r300, swrast)
-  Provoking vertex (GL_ARB_provoking_vertex)            DONE (r300, swrast)
+  BGRA vertex order (GL_ARB_vertex_array_bgra)          DONE ()
+  Base vertex offset(GL_ARB_draw_elements_base_vertex)  DONE ()
+  Frag shader coord (GL_ARB_fragment_coord_conventions) DONE ()
+  Provoking vertex (GL_ARB_provoking_vertex)            DONE ()
   Seamless cubemaps (GL_ARB_seamless_cube_map)          DONE ()
   Multisample textures (GL_ARB_texture_multisample)     DONE ()
-  Frag depth clamp (GL_ARB_depth_clamp)                 DONE (swrast)
-  Fence objects (GL_ARB_sync)                           DONE (r300, swrast)
+  Frag depth clamp (GL_ARB_depth_clamp)                 DONE ()
+  Fence objects (GL_ARB_sync)                           DONE ()
   GLX_ARB_create_context_profile                        DONE
 
 
@@ -82,13 +82,13 @@ GL 3.3, GLSL 3.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, soft
 
   GL_ARB_blend_func_extended                            DONE ()
   GL_ARB_explicit_attrib_location                       DONE (all drivers that support GLSL)
-  GL_ARB_occlusion_query2                               DONE (r300, swrast)
+  GL_ARB_occlusion_query2                               DONE ()
   GL_ARB_sampler_objects                                DONE (all drivers)
   GL_ARB_shader_bit_encoding                            DONE ()
   GL_ARB_texture_rgb10_a2ui                             DONE ()
-  GL_ARB_texture_swizzle                                DONE (r300, swrast)
+  GL_ARB_texture_swizzle                                DONE ()
   GL_ARB_timer_query                                    DONE ()
-  GL_ARB_instanced_arrays                               DONE (r300)
+  GL_ARB_instanced_arrays                               DONE ()
   GL_ARB_vertex_type_2_10_10_10_rev                     DONE ()
 
 
@@ -102,11 +102,11 @@ GL 4.0, GLSL 4.00:
   - Dynamically uniform UBO array indices              DONE (r600)
   - Implicit signed -> unsigned conversions            DONE
   - Fused multiply-add                                 DONE ()
-  - Packing/bitfield/conversion functions              DONE (r600)
+  - Packing/bitfield/conversion functions              DONE (r600, radeonsi)
   - Enhanced textureGather                             DONE (r600, radeonsi)
   - Geometry shader instancing                         DONE (r600)
   - Geometry shader multiple streams                   DONE ()
-  - Enhanced per-sample shading                        DONE (r600)
+  - Enhanced per-sample shading                        DONE (r600, radeonsi)
   - Interpolation functions                            DONE (r600)
   - New overload resolution rules                      DONE
   GL_ARB_gpu_shader_fp64                               DONE (nvc0, softpipe)
@@ -123,7 +123,7 @@ GL 4.0, GLSL 4.00:
 
 GL 4.1, GLSL 4.10:
 
-  GL_ARB_ES2_compatibility                             DONE (i965, nv50, nvc0, r300, r600, radeonsi, llvmpipe, softpipe)
+  GL_ARB_ES2_compatibility                             DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe)
   GL_ARB_get_program_binary                            DONE (0 binary formats)
   GL_ARB_separate_shader_objects                       DONE (all drivers)
   GL_ARB_shader_precision                              started (Micah)
@@ -142,7 +142,8 @@ GL 4.2, GLSL 4.20:
   GL_ARB_shader_image_load_store                       in progress (curro)
   GL_ARB_conservative_depth                            DONE (all drivers that support GLSL 1.30)
   GL_ARB_shading_language_420pack                      DONE (all drivers that support GLSL 1.30)
-  GL_ARB_internalformat_query                          DONE (i965, nv50, nvc0, r300, r600, radeonsi, llvmpipe, softpipe)
+  GL_ARB_shading_language_packing                      DONE (all drivers)
+  GL_ARB_internalformat_query                          DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe)
   GL_ARB_map_buffer_alignment                          DONE (all drivers)
 
 
@@ -175,38 +176,39 @@ GL 4.3, GLSL 4.30:
 GL 4.4, GLSL 4.40:
 
   GL_MAX_VERTEX_ATTRIB_STRIDE                          DONE (all drivers)
-  GL_ARB_buffer_storage                                DONE (i965, nv30, nv50, nvc0, r300, r600, radeonsi)
+  GL_ARB_buffer_storage                                DONE (i965, nv50, nvc0, r600, radeonsi)
   GL_ARB_clear_texture                                 DONE (i965)
   GL_ARB_enhanced_layouts                              not started
   GL_ARB_multi_bind                                    DONE (all drivers)
   GL_ARB_query_buffer_object                           not started
-  GL_ARB_texture_mirror_clamp_to_edge                  DONE (i965, nv30, nv50, nvc0, r300, r600, radeonsi, swrast, llvmpipe, softpipe)
+  GL_ARB_texture_mirror_clamp_to_edge                  DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe)
   GL_ARB_texture_stencil8                              not started
   GL_ARB_vertex_type_10f_11f_11f_rev                   DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe)
 
 GL 4.5, GLSL 4.50:
 
   GL_ARB_ES3_1_compatibility                           not started
-  GL_ARB_clip_control                                  DONE (nv50, nvc0, r300, r600, radeonsi, llvmpipe, softpipe)
+  GL_ARB_clip_control                                  DONE (nv50, nvc0, r600, radeonsi, llvmpipe, softpipe)
   GL_ARB_conditional_render_inverted                   DONE (i965, nv50, nvc0, llvmpipe, softpipe)
   GL_ARB_cull_distance                                 not started
   GL_ARB_derivative_control                            DONE (i965, nv50, nvc0, r600)
   GL_ARB_direct_state_access                           started
   - Transform Feedback object                          started (Martin Peres)
-  - Buffer object                                      started (Laura Ekstrand)
+  - Buffer object                                      DONE
   - Framebuffer object                                 started (Laura Ekstrand)
   - Renderbuffer object                                started (Martin Peres)
-  - Texture object                                     started (Laura Ekstrand)
+  - Texture object                                     DONE
   - Vertex array object                                started (Fredrik Höglund)
   - Sampler object                                     started (Martin Peres)
   - Program Pipeline object                            started (Martin Peres)
   - Query object                                       started (Martin Peres)
   GL_ARB_get_texture_sub_image                         started (Brian Paul)
   GL_ARB_shader_texture_image_samples                  not started
-  GL_ARB_texture_barrier                               DONE (nv50, nvc0, r300, r600, radeonsi)
+  GL_ARB_texture_barrier                               DONE (nv50, nvc0, r600, radeonsi)
   GL_KHR_context_flush_control                         DONE (all - but needs GLX/EXT extension to be useful)
   GL_KHR_robust_buffer_access_behavior                 not started
   GL_KHR_robustness                                    90% done (the ARB variant)
+  GL_EXT_shader_integer_mix                            DONE (all drivers that support GLSL)
 
 These are the extensions cherry-picked to make GLES 3.1
 GLES3.1, GLSL ES 3.1
@@ -219,11 +221,12 @@ GLES3.1, GLSL ES 3.1
   GL_ARB_shader_atomic_counters                        DONE (i965)
   GL_ARB_shader_image_load_store                       in progress (curro)
   GL_ARB_shader_storage_buffer_object                  not started
+  GL_ARB_shading_language_packing                      DONE (all drivers)
   GL_ARB_separate_shader_objects                       DONE (all drivers)
   GL_ARB_stencil_texturing                             DONE (i965/gen8+, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe)
   GL_ARB_vertex_attrib_binding                         DONE (all drivers)
   GS5 Enhanced textureGather                           DONE (i965, nvc0, r600, radeonsi)
-  GS5 Packing/bitfield/conversion functions            DONE (i965, nvc0, r600)
+  GS5 Packing/bitfield/conversion functions            DONE (i965, nvc0, r600, radeonsi)
   GL_EXT_shader_integer_mix                            DONE (all drivers that support GLSL)
 
 
diff --git a/mesalib/docs/dispatch.html b/mesalib/docs/dispatch.html
index aacd01e0c..c96ec2de3 100644
--- a/mesalib/docs/dispatch.html
+++ b/mesalib/docs/dispatch.html
@@ -204,9 +204,8 @@ terribly relevant.</p>
 few preprocessor defines.</p>
 
 <ul>
-<li>If <tt>GLX_USE_TLS</tt> is defined, method #4 is used.</li>
-<li>If <tt>HAVE_PTHREAD</tt> is defined, method #3 is used.</li>
-<li>If <tt>WIN32_THREADS</tt> is defined, method #2 is used.</li>
+<li>If <tt>GLX_USE_TLS</tt> is defined, method #3 is used.</li>
+<li>If <tt>HAVE_PTHREAD</tt> is defined, method #2 is used.</li>
 <li>If none of the preceding are defined, method #1 is used.</li>
 </ul>
 
diff --git a/mesalib/docs/egl.html b/mesalib/docs/egl.html
index a715a3ad3..d946bb0ae 100644
--- a/mesalib/docs/egl.html
+++ b/mesalib/docs/egl.html
@@ -88,8 +88,11 @@ types such as <code>EGLNativeDisplayType</code> or
 <code>EGLNativeWindowType</code> defined for.</p>
 
 <p>The available platforms are <code>x11</code>, <code>drm</code>,
-<code>fbdev</code>, and <code>gdi</code>.  The <code>gdi</code> platform can
-only be built with SCons.  Unless for special needs, the build system should
+<code>wayland</code>, <code>null</code>, <code>android</code>,
+<code>haiku</code>, and <code>gdi</code>.  The <code>android</code> platform
+can only be built as a system component, part of AOSP, while the
+<code>haiku</code> and <code>gdi</code> platforms can only be built with SCons.
+Unless for special needs, the build system should
 select the right platforms automatically.</p>
 
 </dd>
diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html
index 9b72bc1f2..9bc5843ff 100644
--- a/mesalib/docs/index.html
+++ b/mesalib/docs/index.html
@@ -16,6 +16,31 @@
 
 <h1>News</h1>
 
+<h2>March 20, 2015</h2>
+<p>
+<a href="relnotes/10.4.7.html">Mesa 10.4.7</a> is released.
+This is a bug-fix release.
+</p>
+
+<h2>March 13, 2015</h2>
+<p>
+<a href="relnotes/10.5.1.html">Mesa 10.5.1</a> is released.
+This is a bug-fix release.
+</p>
+
+<h2>March 06, 2015</h2>
+<p>
+<a href="relnotes/10.5.0.html">Mesa 10.5.0</a> is released.  This is a new
+development release.  See the release notes for more information about
+the release.
+</p>
+
+<h2>March 06, 2015</h2>
+<p>
+<a href="relnotes/10.4.6.html">Mesa 10.4.6</a> is released.
+This is a bug-fix release.
+</p>
+
 <h2>February 21, 2015</h2>
 <p>
 <a href="relnotes/10.4.5.html">Mesa 10.4.5</a> is released.
diff --git a/mesalib/docs/install.html b/mesalib/docs/install.html
index 9dbfce58b..a90c2b27d 100644
--- a/mesalib/docs/install.html
+++ b/mesalib/docs/install.html
@@ -55,8 +55,8 @@ Versions 2.5.35 and 2.4.1, respectively, (or later) should work.
 <br>
 On Windows with MinGW, install flex and bison with:
 <pre>mingw-get install msys-flex msys-bison</pre>
-For MSVC on Windows, you can find flex/bison programs on the
-<a href="ftp://ftp.freedesktop.org/pub/mesa/windows-utils/">Mesa ftp site</a>.
+For MSVC on Windows, install
+<a href="http://winflexbison.sourceforge.net/">Win flex-bison</a>.
 </li>
 </ul>
 
diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html
index d4ba11005..023f7dd8f 100644
--- a/mesalib/docs/relnotes.html
+++ b/mesalib/docs/relnotes.html
@@ -21,6 +21,10 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>
 
 <ul>
+<li><a href="relnotes/10.4.7.html">10.4.7 release notes</a>
+<li><a href="relnotes/10.5.1.html">10.5.1 release notes</a>
+<li><a href="relnotes/10.5.0.html">10.5.0 release notes</a>
+<li><a href="relnotes/10.4.6.html">10.4.6 release notes</a>
 <li><a href="relnotes/10.4.5.html">10.4.5 release notes</a>
 <li><a href="relnotes/10.4.4.html">10.4.4 release notes</a>
 <li><a href="relnotes/10.4.3.html">10.4.3 release notes</a>
diff --git a/mesalib/docs/relnotes/10.4.6.html b/mesalib/docs/relnotes/10.4.6.html
new file mode 100644
index 000000000..22647f69e
--- /dev/null
+++ b/mesalib/docs/relnotes/10.4.6.html
@@ -0,0 +1,143 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Mesa Release Notes</title>
+  <link rel="stylesheet" type="text/css" href="../mesa.css">
+</head>
+<body>
+
+<div class="header">
+  <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="../contents.html"></iframe>
+<div class="content">
+
+<h1>Mesa 10.4.6 Release Notes / March 06, 2015</h1>
+
+<p>
+Mesa 10.4.6 is a bug fix release which fixes bugs found since the 10.4.5 release.
+</p>
+<p>
+Mesa 10.4.6 implements the OpenGL 3.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.3.  OpenGL
+3.3 is <strong>only</strong> available if requested at context creation
+because compatibility contexts are not supported.
+</p>
+
+<h2>SHA256 checksums</h2>
+<pre>
+46c9082142e811c01e49a2c332a9ac0a1eb98f2908985fb9df216539d7eaeaf4  MesaLib-10.4.6.tar.gz
+d8baedd20e79ccd98a5a7b05e23d59a30892e68de1fcc057ca6873dafca02735  MesaLib-10.4.6.tar.bz2
+6aded6eac7f0d4d55117b8b581d8424710bbb4c768fc90f7b881f29311a751aa  MesaLib-10.4.6.zip
+</pre>
+
+<h2>New features</h2>
+<p>None</p>
+
+<h2>Bug fixes</h2>
+
+<p>This list is likely incomplete.</p>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=45348">Bug 45348</a> - [swrast] piglit fbo-drawbuffers-arbfp regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=84613">Bug 84613</a> - [G965, bisected] piglit regressions : glslparsertest.glsl2</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=87516">Bug 87516</a> - glProgramBinary violates spec</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88885">Bug 88885</a> - Transform feedback uses incorrect interleaving if a previous draw did not write gl_Position</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89180">Bug 89180</a> - [IVB regression] Rendering issues in Mass Effect through VMware Workstation</li>
+
+</ul>
+
+
+<h2>Changes</h2>
+
+<p>Abdiel Janulgue (2):</p>
+<ul>
+  <li>glsl: Don't optimize min/max into saturate when EmitNoSat is set</li>
+  <li>st/mesa: For vertex shaders, don't emit saturate when SM 3.0 is unsupported</li>
+</ul>
+
+<p>Andreas Boll (1):</p>
+<ul>
+  <li>glx: Fix returned values of GLX_RENDERER_PREFERRED_PROFILE_MESA</li>
+</ul>
+
+<p>Brian Paul (2):</p>
+<ul>
+  <li>swrast: fix multiple color buffer writing</li>
+  <li>st/mesa: fix sampler view reference counting bug in glDraw/CopyPixels</li>
+</ul>
+
+<p>Chris Forbes (1):</p>
+<ul>
+  <li>i965/gs: Check newly-generated GS-out VUE map against correct stage</li>
+</ul>
+
+<p>Eduardo Lima Mitev (1):</p>
+<ul>
+  <li>mesa: Fix error validating args for TexSubImage3D</li>
+</ul>
+
+<p>Emil Velikov (6):</p>
+<ul>
+  <li>docs: Add sha256 sums for the 10.4.5 release</li>
+  <li>install-lib-links: remove the .install-lib-links file</li>
+  <li>Revert "mesa: Correct backwards NULL check."</li>
+  <li>mesa: cherry-pick the second half of commit 2aa71e9485a</li>
+  <li>Revert "gallivm: Update for RTDyldMemoryManager becoming an unique_ptr."</li>
+  <li>Update version to 10.4.6</li>
+</ul>
+
+<p>Ian Romanick (3):</p>
+<ul>
+  <li>mesa: Add missing error checks in _mesa_ProgramBinary</li>
+  <li>mesa: Ensure that length is set to zero in _mesa_GetProgramBinary</li>
+  <li>mesa: Always generate GL_INVALID_OPERATION in _mesa_GetProgramBinary</li>
+</ul>
+
+<p>Jonathan Gray (1):</p>
+<ul>
+  <li>auxilary/os: correct sysctl use in os_get_total_physical_memory()</li>
+</ul>
+
+<p>José Fonseca (1):</p>
+<ul>
+  <li>gallivm: Update for RTDyldMemoryManager becoming an unique_ptr.</li>
+</ul>
+
+<p>Leo Liu (1):</p>
+<ul>
+  <li>st/omx/dec/h264: fix picture out-of-order with poc type 0 v2</li>
+</ul>
+
+<p>Lucas Stach (1):</p>
+<ul>
+  <li>install-lib-links: don't depend on .libs directory</li>
+</ul>
+
+<p>Marek Olšák (2):</p>
+<ul>
+  <li>vbo: fix an unitialized-variable warning</li>
+  <li>radeonsi: fix point sprites</li>
+</ul>
+
+<p>Matt Turner (4):</p>
+<ul>
+  <li>glsl: Rewrite and fix min/max to saturate optimization.</li>
+  <li>mesa: Correct backwards NULL check.</li>
+  <li>i965/fs: Don't use backend_visitor::instructions after creating the CFG.</li>
+  <li>mesa: Correct backwards NULL check.</li>
+</ul>
+
+
+</div>
+</body>
+</html>
diff --git a/mesalib/docs/relnotes/10.4.7.html b/mesalib/docs/relnotes/10.4.7.html
new file mode 100644
index 000000000..019135350
--- /dev/null
+++ b/mesalib/docs/relnotes/10.4.7.html
@@ -0,0 +1,134 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Mesa Release Notes</title>
+  <link rel="stylesheet" type="text/css" href="../mesa.css">
+</head>
+<body>
+
+<div class="header">
+  <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="../contents.html"></iframe>
+<div class="content">
+
+<h1>Mesa 10.4.7 Release Notes / March 20, 2015</h1>
+
+<p>
+Mesa 10.4.7 is a bug fix release which fixes bugs found since the 10.4.6 release.
+</p>
+<p>
+Mesa 10.4.7 implements the OpenGL 3.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.3.  OpenGL
+3.3 is <strong>only</strong> available if requested at context creation
+because compatibility contexts are not supported.
+</p>
+
+<h2>SHA256 checksums</h2>
+<pre>
+9e7b59267199658808f8b33e0410b86fbafbdcd52378658b9df65fac9d24947f  MesaLib-10.4.7.tar.gz
+2c351c98671f9a7ab3fd9c601bb7a255801b1580f5dd0992639f99152801b0d2  MesaLib-10.4.7.tar.bz2
+d14ac578b5ce16560757b53fbd1cb4d6b34652f8e110e4b10a019adc82e67ffd  MesaLib-10.4.7.zip
+</pre>
+
+<h2>New features</h2>
+<p>None</p>
+
+<h2>Bug fixes</h2>
+
+<p>This list is likely incomplete.</p>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=79202">Bug 79202</a> - valgrind errors in glsl-fs-uniform-array-loop-unroll.shader_test; random code generation</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89156">Bug 89156</a> - r300g: GL_COMPRESSED_RED_RGTC1 / ATI1N support broken</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89224">Bug 89224</a> - Incorrect rendering of Unigine Valley running in VM on VMware Workstation</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89530">Bug 89530</a> - FTBFS in loader: missing fstat</li>
+
+</ul>
+
+<h2>Changes</h2>
+
+<p>Andrey Sudnik (1):</p>
+<ul>
+  <li>i965/vec4: Don't lose the saturate modifier in copy propagation.</li>
+</ul>
+
+<p>Daniel Stone (1):</p>
+<ul>
+  <li>egl: Take alpha bits into account when selecting GBM formats</li>
+</ul>
+
+<p>Emil Velikov (6):</p>
+<ul>
+  <li>docs: Add sha256 sums for the 10.4.6 release</li>
+  <li>cherry-ignore: add not applicable/rejected commits</li>
+  <li>mesa: rename format_info.c to format_info.h</li>
+  <li>loader: include &lt;sys/stat.h&gt; for non-sysfs builds</li>
+  <li>auxiliary/os: fix the android build - s/drm_munmap/os_munmap/</li>
+  <li>Update version to 10.4.7</li>
+</ul>
+
+<p>Iago Toral Quiroga (1):</p>
+<ul>
+  <li>i965: Fix out-of-bounds accesses into pull_constant_loc array</li>
+</ul>
+
+<p>Ilia Mirkin (4):</p>
+<ul>
+  <li>freedreno: move fb state copy after checking for size change</li>
+  <li>freedreno/ir3: fix array count returned by TXQ</li>
+  <li>freedreno/ir3: get the # of miplevels from getinfo</li>
+  <li>freedreno: fix slice pitch calculations</li>
+</ul>
+
+<p>Marc-Andre Lureau (1):</p>
+<ul>
+  <li>gallium/auxiliary/indices: fix start param</li>
+</ul>
+
+<p>Marek Olšák (4):</p>
+<ul>
+  <li>r300g: fix RGTC1 and LATC1 SNORM formats</li>
+  <li>r300g: fix a crash when resolving into an sRGB texture</li>
+  <li>r300g: fix sRGB-&gt;sRGB blits</li>
+  <li>radeonsi: increase coords array size for radeon_llvm_emit_prepare_cube_coords</li>
+</ul>
+
+<p>Mario Kleiner (1):</p>
+<ul>
+  <li>glx: Handle out-of-sequence swap completion events correctly. (v2)</li>
+</ul>
+
+<p>Matt Turner (2):</p>
+<ul>
+  <li>r300g: Use PATH_MAX instead of limiting ourselves to 100 chars.</li>
+  <li>r300g: Check return value of snprintf().</li>
+</ul>
+
+<p>Rob Clark (2):</p>
+<ul>
+  <li>freedreno/ir3: fix silly typo for binning pass shaders</li>
+  <li>freedreno: update generated headers</li>
+</ul>
+
+<p>Samuel Iglesias Gonsalvez (1):</p>
+<ul>
+  <li>glsl: optimize (0 cmp x + y) into (-x cmp y).</li>
+</ul>
+
+<p>Stefan Dösinger (1):</p>
+<ul>
+  <li>r300g: Fix the ATI1N swizzle (RGTC1 and LATC1)</li>
+</ul>
+
+</div>
+</body>
+</html>
diff --git a/mesalib/docs/relnotes/10.5.0.html b/mesalib/docs/relnotes/10.5.0.html
index 578db4f24..1d3dd8898 100644
--- a/mesalib/docs/relnotes/10.5.0.html
+++ b/mesalib/docs/relnotes/10.5.0.html
@@ -14,7 +14,7 @@
 <iframe src="../contents.html"></iframe>
 <div class="content">
 
-<h1>Mesa 10.5.0 Release Notes / TBD</h1>
+<h1>Mesa 10.5.0 Release Notes / March 06, 2015</h1>
 
 <p>
 Mesa 10.5.0 is a new development release.
@@ -31,9 +31,10 @@ because compatibility contexts are not supported.
 </p>
 
 
-<h2>MD5 checksums</h2>
+<h2>SHA256 checksums</h2>
 <pre>
-TBD.
+2bb6e2e982ee4d8264d52d638c2a4e3f8a164190336d72d4e34ae1304d87ed91  mesa-10.5.0.tar.gz
+d7ca9f9044bbdd674377e3eebceef1fae339c8817b9aa435c2053e4fea44e5d3  mesa-10.5.0.tar.xz
 </pre>
 
 
@@ -55,7 +56,150 @@ Note: some of the new features are only available with certain drivers.
 
 <h2>Bug fixes</h2>
 
-TBD.
+<p>This list is likely incomplete.</p>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=10370">Bug 10370</a> - Incorrect pixels read back if draw bitmap texture through Display list</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=45348">Bug 45348</a> - [swrast] piglit fbo-drawbuffers-arbfp regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=60879">Bug 60879</a> - [radeonsi] X11 can't start with acceleration enabled</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=67672">Bug 67672</a> - [llvmpipe] lp_test_arit fails on old CPUs</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=77544">Bug 77544</a> - i965: Try to use LINE instructions to perform MAD with immediate arguments</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=78770">Bug 78770</a> - [SNB bisected]Webglc conformance/textures/texture-size-limit.html fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=80568">Bug 80568</a> - [gen4] GPU Crash During Google Chrome Operation</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=82477">Bug 82477</a> - [softpipe] piglit fp-long-alu regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=82585">Bug 82585</a> - geometry shader with optional out variable segfaults</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=82991">Bug 82991</a> - Inverted bumpmap in webgl applications</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=83463">Bug 83463</a> - [swrast] piglit glsl-vs-clamp-1 regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=83500">Bug 83500</a> - si_dma_copy_tile causes GPU hangs</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=83510">Bug 83510</a> - Graphical glitches in Unreal Engine 4</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=83908">Bug 83908</a> - [i965] Incorrect icon colors in Steam Big Picture</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=84212">Bug 84212</a> - [BSW]ES3-CTS.shaders.loops.do_while_dynamic_iterations.vector_counter_vertex fails and causes GPU hang</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=84651">Bug 84651</a> - Distorted graphics or black window when running Battle.net app on Intel hardware via wine</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=84777">Bug 84777</a> - [BSW]Piglit spec_glsl-1.50_execution_geometry-basic fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=85367">Bug 85367</a> - [gen4] GPU hang in glmark-es2</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=85467">Bug 85467</a> - [llvmpipe] piglit gl-1.0-dlist-beginend failure with llvm-3.6.0svn</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=85529">Bug 85529</a> - Surfaces not drawn in Unvanquished</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=85647">Bug 85647</a> - Random radeonsi crashes with mesa 10.3.x</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=85696">Bug 85696</a> - r600g+nine: Bioshock shader failure after 7b1c0cbc90d456384b0950ad21faa3c61a6b43ff</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86089">Bug 86089</a> - [r600g][mesa 10.4.0-dev] shader failure - r600_sb::bc_finalizer::cf_peephole() when starting Second Life</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86618">Bug 86618</a> - [NV96] neg modifiers not working in MIN and MAX operations</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86760">Bug 86760</a> - mesa doesn't build: recipe for target 'r600_llvm.lo' failed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86764">Bug 86764</a> - [SNB+ Bisected]Piglit glean/pointSprite fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86788">Bug 86788</a> - (bisected) 32bit UrbanTerror 4.1 timedemo sse4.1 segfault...</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86811">Bug 86811</a> - [BDW/BSW Bisected]Piglit spec_arb_shading_language_packing_execution_built-in-functions_vs-unpackSnorm4x8 fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86837">Bug 86837</a> - kodi segfault since auxiliary/vl: rework the build of the VL code</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86939">Bug 86939</a> - test_vf_float_conversions.cpp:63:12: error: expected primary-expression before ‘union’</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86944">Bug 86944</a> - glsl_parser_extras.cpp&quot;, line 1455: Error: Badly formed expression. (Oracle Studio)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86958">Bug 86958</a> - lp_bld_misc.cpp:503:40: error: no matching function for call to ‘llvm::EngineBuilder::setMCJITMemoryManager(ShaderMemoryManager*&amp;)’</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86969">Bug 86969</a> - _drm_intel_gem_bo_references() function takes half the CPU with Witcher2 game</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=87076">Bug 87076</a> - Dead Island needs allow_glsl_extension_directive_midshader</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=87516">Bug 87516</a> - glProgramBinary violates spec</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=87619">Bug 87619</a> - Changes to state such as render targets change fragment shader without marking it dirty.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=87658">Bug 87658</a> - [llvmpipe] SEGV in sse2_has_daz on ancient Pentium4-M</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=87694">Bug 87694</a> - [SNB] Crash in brw_begin_transform_feedback</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=87886">Bug 87886</a> - constant fps drops with Intel and Radeon</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=87887">Bug 87887</a> - [i965 Bisected]ES2-CTS.gtf.GL.cos.cos_float_vert_xvary fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=87913">Bug 87913</a> - CPU cacheline size of 0 can be returned by CPUID leaf 0x80000006 in some virtual machines</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88079">Bug 88079</a> - dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0 tests fail due to enabling of GL_RGB and GL_RGBA</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88170">Bug 88170</a> - 32 bits opengl apps crash with latest llvm 3.6 git / mesa git / radeonsi</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88219">Bug 88219</a> - include/c11/threads_posix.h:197: undefined reference to `pthread_mutex_lock'</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88227">Bug 88227</a> - Radeonsi: High GTT usage in Prison Architect large map</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88248">Bug 88248</a> - Calling glClear while there is an occlusion query in progress messes up the results</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88335">Bug 88335</a> - format_pack.c:9567:22: error: expected ')'</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88385">Bug 88385</a> - [SNB+ Bisected]Ogles3conform ES3-CTS.gtf.GL3Tests.packed_pixels.packed_pixels core dumped</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88467">Bug 88467</a> - nir.c:140: error: ‘nir_src’ has no member named ‘ssa’</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88478">Bug 88478</a> - #error &quot;&lt;malloc.h&gt; has been replaced by &lt;stdlib.h&gt;&quot;</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88519">Bug 88519</a> - sha1.c:210:22: error: 'grcy_md_hd_t' undeclared (first use in this function)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88523">Bug 88523</a> - sha1.c:37: error: 'SHA1_CTX' undeclared (first use in this function)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88561">Bug 88561</a> - [radeonsi][regression,bisected] Depth test/buffer issues in Portal</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88658">Bug 88658</a> - (bisected) Slow video playback on Kabini</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88662">Bug 88662</a> - unaligned access to gl_dlist_node</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88783">Bug 88783</a> - FTBFS: Clover: src/gallium/state_trackers/clover/llvm/invocation.cpp:335:49: error: no matching function for call to 'llvm::TargetLibraryInfo::TargetLibraryInfo(llvm::Triple)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88792">Bug 88792</a> - [BDW/BSW Bisected]Piglit spec_ARB_pixel_buffer_object_pbo-read-argb8888 fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88806">Bug 88806</a> - nir/nir_constant_expressions.c:2754:15: error: controlling expression type 'unsigned int' not compatible with any generic association type</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88841">Bug 88841</a> - [SNB/IVB/HSW/BDW Bisected]Piglit spec_EGL_NOK_texture_from_pixmap_basic fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88852">Bug 88852</a> - macros.h(181) : error C2143: syntax error : missing '{' before 'enum [tag]'</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88905">Bug 88905</a> - [SNB+ Bisected]Ogles3conform ES3-CTS.gtf.GL3Tests.packed_pixels.packed_pixels fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88930">Bug 88930</a> - [osmesa] osbuffer-&gt;textures should be indexed by attachment type</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88962">Bug 88962</a> - [osmesa] Crash on postprocessing if z buffer is NULL</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89032">Bug 89032</a> - [BDW/BSW/SKL Bisected]Piglit spec_OpenGL_1.1_infinite-spot-light fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89037">Bug 89037</a> - [SKL]Piglit spec_EXT_texture_array_copyteximage_1D_ARRAY_samples=2 sporadically causes GPU hang</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89068">Bug 89068</a> - glTexImage2D regression by texstore_rgba switch to _mesa_format_convert</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89069">Bug 89069</a> - Lack of grass in The Talos Principle on radeonsi (native\wine\nine)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89180">Bug 89180</a> - [IVB regression] Rendering issues in Mass Effect through VMware Workstation</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86330">Bug 86330</a> - lp_bld_debug.cpp:112: multiple definition of `raw_debug_ostream::write_impl(char const*, unsigned long)'</li>
+
+</ul>
+
 
 <h2>Changes</h2>
 
diff --git a/mesalib/docs/relnotes/10.5.1.html b/mesalib/docs/relnotes/10.5.1.html
new file mode 100644
index 000000000..a9b91fa72
--- /dev/null
+++ b/mesalib/docs/relnotes/10.5.1.html
@@ -0,0 +1,217 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Mesa Release Notes</title>
+  <link rel="stylesheet" type="text/css" href="../mesa.css">
+</head>
+<body>
+
+<div class="header">
+  <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="../contents.html"></iframe>
+<div class="content">
+
+<h1>Mesa 10.5.1 Release Notes / March 13, 2015</h1>
+
+<p>
+Mesa 10.5.1 is a bug fix release which fixes bugs found since the 10.5.0 release.
+</p>
+<p>
+Mesa 10.5.1 implements the OpenGL 3.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.3.  OpenGL
+3.3 is <strong>only</strong> available if requested at context creation
+because compatibility contexts are not supported.
+</p>
+
+
+<h2>SHA256 checksums</h2>
+<pre>
+b5b6256a6d46023e16a675257fd11a0f94d7b3e60a76cf112952da3d0fef8e9b  mesa-10.5.1.tar.gz
+ffc51943d15c6812ee7611d053d8980a683fbd6a4986cff567b12cc66637d679  mesa-10.5.1.tar.xz
+</pre>
+
+
+<h2>New features</h2>
+<p>None</p>
+
+<h2>Bug fixes</h2>
+
+<p>This list is likely incomplete.</p>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=79202">Bug 79202</a> - valgrind errors in glsl-fs-uniform-array-loop-unroll.shader_test; random code generation</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=84613">Bug 84613</a> - [G965, bisected] piglit regressions : glslparsertest.glsl2</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86747">Bug 86747</a> - Noise in Football Manager 2014 textures</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=86974">Bug 86974</a> - INTEL_DEBUG=shader_time always asserts in fs_generator::generate_code() when Mesa is built with --enable-debug (= with asserts)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88246">Bug 88246</a> - Commit 2881b12 causes 43 DrawElements test regressions</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88793">Bug 88793</a> - [BDW/BSW Bisected]Piglit/shaders_glsl-max-varyings fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88883">Bug 88883</a> - ir-a2xx.c: variable changed in assert statement</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=88885">Bug 88885</a> - Transform feedback uses incorrect interleaving if a previous draw did not write gl_Position</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89095">Bug 89095</a> - [SNB/IVB/BYT Bisected]Webglc conformance/glsl/functions/glsl-function-mix-float.html fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89156">Bug 89156</a> - r300g: GL_COMPRESSED_RED_RGTC1 / ATI1N support broken</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89224">Bug 89224</a> - Incorrect rendering of Unigine Valley running in VM on VMware Workstation</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89292">Bug 89292</a> - [regression,bisected] incomplete screenshots in some cases</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89311">Bug 89311</a> - [regression, bisected] dEQP: Added entry points for glCompressedTextureSubImage*D.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89312">Bug 89312</a> - [regression, bisected] main: Added entry points for CopyTextureSubImage*D. (d6b7c40cecfe01)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89315">Bug 89315</a> - [HSW, regression, bisected] i965/fs: Emit MAD instructions when possible.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89317">Bug 89317</a> - [HSW, regression, bisected] i965: Add LINTERP/CINTERP to can_do_cmod() (d91390634)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89416">Bug 89416</a> - UE4Editor crash after load project</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89430">Bug 89430</a> - [g965][bisected] arb_copy_image-targets gl_texture* tests fail</li>
+
+</ul>
+
+
+<h2>Changes</h2>
+
+<p>Andrey Sudnik (1):</p>
+<ul>
+  <li>i965/vec4: Don't lose the saturate modifier in copy propagation.</li>
+</ul>
+
+<p>Chris Forbes (1):</p>
+<ul>
+  <li>i965/gs: Check newly-generated GS-out VUE map against correct stage</li>
+</ul>
+
+<p>Daniel Stone (1):</p>
+<ul>
+  <li>egl: Take alpha bits into account when selecting GBM formats</li>
+</ul>
+
+<p>Emil Velikov (5):</p>
+<ul>
+  <li>docs: Add sha256 sums for the 10.5.0 release</li>
+  <li>egl/main: no longer export internal function</li>
+  <li>cherry-ignore: ignore a few more commits picked without -x</li>
+  <li>mapi: fix commit 90411b56f6bc817e229d8801ac0adad6d4e3fb7a</li>
+  <li>Update version to 10.5.1</li>
+</ul>
+
+<p>Frank Henigman (1):</p>
+<ul>
+  <li>intel: fix EGLImage renderbuffer _BaseFormat</li>
+</ul>
+
+<p>Iago Toral Quiroga (1):</p>
+<ul>
+  <li>i965: Fix out-of-bounds accesses into pull_constant_loc array</li>
+</ul>
+
+<p>Ian Romanick (1):</p>
+<ul>
+  <li>i965/fs/nir: Use emit_math for nir_op_fpow</li>
+</ul>
+
+<p>Ilia Mirkin (3):</p>
+<ul>
+  <li>freedreno: move fb state copy after checking for size change</li>
+  <li>freedreno/ir3: fix array count returned by TXQ</li>
+  <li>freedreno/ir3: get the # of miplevels from getinfo</li>
+</ul>
+
+<p>Jason Ekstrand (2):</p>
+<ul>
+  <li>meta/TexSubImage: Stash everything other than PIXEL_TRANSFER/store in meta_begin</li>
+  <li>main/base_tex_format: Properly handle STENCIL_INDEX1/4/16</li>
+</ul>
+
+<p>Kenneth Graunke (8):</p>
+<ul>
+  <li>i965: Split Gen4-5 BlitFramebuffer code; prefer BLT over Meta.</li>
+  <li>glsl: Mark array access when copying to a temporary for the ?: operator.</li>
+  <li>i965/fs: Set force_writemask_all on shader_time instructions.</li>
+  <li>i965/fs: Set smear on shader_time diff register.</li>
+  <li>i965/fs: Make emit_shader_time_write return rather than emit.</li>
+  <li>i965/fs: Make get_timestamp() pass back the MOV rather than emitting it.</li>
+  <li>i965/fs: Make emit_shader_time_end() insert before EOT.</li>
+  <li>i965/fs: Don't issue FB writes for bound but unwritten color targets.</li>
+</ul>
+
+<p>Laura Ekstrand (2):</p>
+<ul>
+  <li>main: Fix target checking for CompressedTexSubImage*D.</li>
+  <li>main: Fix target checking for CopyTexSubImage*D.</li>
+</ul>
+
+<p>Marc-Andre Lureau (1):</p>
+<ul>
+  <li>gallium/auxiliary/indices: fix start param</li>
+</ul>
+
+<p>Marek Olšák (3):</p>
+<ul>
+  <li>r300g: fix RGTC1 and LATC1 SNORM formats</li>
+  <li>r300g: fix a crash when resolving into an sRGB texture</li>
+  <li>r300g: fix sRGB-&gt;sRGB blits</li>
+</ul>
+
+<p>Matt Turner (12):</p>
+<ul>
+  <li>i965/vec4: Fix implementation of i2b.</li>
+  <li>mesa: Indent break statements and add a missing one.</li>
+  <li>mesa: Free memory allocated for luminance in readpixels.</li>
+  <li>mesa: Correct backwards NULL check.</li>
+  <li>i965: Consider scratch writes to have side effects.</li>
+  <li>i965/fs: Don't use backend_visitor::instructions after creating the CFG.</li>
+  <li>r300g: Use PATH_MAX instead of limiting ourselves to 100 chars.</li>
+  <li>r300g: Check return value of snprintf().</li>
+  <li>i965/fs: Don't propagate cmod to inst with different type.</li>
+  <li>i965: Tell intel_get_memcpy() which direction the memcpy() is going.</li>
+  <li>Revert SHA1 additions.</li>
+  <li>i965: Avoid applying negate to wrong MAD source.</li>
+</ul>
+
+<p>Neil Roberts (4):</p>
+<ul>
+  <li>meta: In pbo_{Get,}TexSubImage don't repeatedly rebind the source tex</li>
+  <li>Revert "common: Fix PBOs for 1D_ARRAY."</li>
+  <li>meta: Allow GL_UN/PACK_IMAGE_HEIGHT in _mesa_meta_pbo_Get/TexSubImage</li>
+  <li>meta: Fix the y offset for 1D_ARRAY in _mesa_meta_pbo_TexSubImage</li>
+</ul>
+
+<p>Rob Clark (11):</p>
+<ul>
+  <li>freedreno/ir3: fix silly typo for binning pass shaders</li>
+  <li>freedreno/a2xx: fix increment in assert</li>
+  <li>freedreno/a4xx: bit of cleanup</li>
+  <li>freedreno: update generated headers</li>
+  <li>freedreno/a4xx: set PC_PRIM_VTX_CNTL.VAROUT properly</li>
+  <li>freedreno: update generated headers</li>
+  <li>freedreno/a4xx: aniso filtering</li>
+  <li>freedreno/ir3: fix up cat6 instruction encodings</li>
+  <li>freedreno/ir3: add support for memory (cat6) instructions</li>
+  <li>freedreno/ir3: handle flat bypass for a4xx</li>
+  <li>freedreno/ir3: fix failed assert in grouping</li>
+</ul>
+
+<p>Stefan Dösinger (1):</p>
+<ul>
+  <li>r300g: Fix the ATI1N swizzle (RGTC1 and LATC1)</li>
+</ul>
+
+</div>
+</body>
+</html>
diff --git a/mesalib/docs/relnotes/10.6.0.html b/mesalib/docs/relnotes/10.6.0.html
index a396109bb..00aaaa5fc 100644
--- a/mesalib/docs/relnotes/10.6.0.html
+++ b/mesalib/docs/relnotes/10.6.0.html
@@ -61,7 +61,10 @@ TBD.
 <ul>
 <li>Removed classic Windows software rasterizer.</li>
 <li>Removed egl_gallium EGL driver.</li>
+<li>Removed gbm_gallium GBM driver.</li>
 <li>Removed OpenVG support.</li>
+<li>Removed the galahad gallium driver.</li>
+<li>Removed the identity gallium driver.</li>
 </ul>
 
 </div>
diff --git a/mesalib/include/c11/threads_posix.h b/mesalib/include/c11/threads_posix.h
index f9c165df4..2182c2835 100644
--- a/mesalib/include/c11/threads_posix.h
+++ b/mesalib/include/c11/threads_posix.h
@@ -177,13 +177,8 @@ mtx_init(mtx_t *mtx, int type)
       && type != (mtx_try|mtx_recursive))
         return thrd_error;
     pthread_mutexattr_init(&attr);
-    if ((type & mtx_recursive) != 0) {
-#if defined(__linux__) || defined(__linux)
-        pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-#else
+    if ((type & mtx_recursive) != 0)
         pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-#endif
-    }
     pthread_mutex_init(mtx, &attr);
     pthread_mutexattr_destroy(&attr);
     return thrd_success;
diff --git a/mesalib/include/c99_alloca.h b/mesalib/include/c99_alloca.h
index ed66fda01..5a3b8c19a 100644
--- a/mesalib/include/c99_alloca.h
+++ b/mesalib/include/c99_alloca.h
@@ -35,7 +35,7 @@
 
 #  define alloca _alloca
 
-#elif defined(__sun)
+#elif defined(__sun) || defined(__CYGWIN__)
 
 #  include <alloca.h>
 
diff --git a/mesalib/include/c99_compat.h b/mesalib/include/c99_compat.h
index f56f6f326..4fc91bc13 100644
--- a/mesalib/include/c99_compat.h
+++ b/mesalib/include/c99_compat.h
@@ -25,6 +25,8 @@
  *
  **************************************************************************/
 
+#include "no_extern_c.h"
+
 #ifndef _C99_COMPAT_H_
 #define _C99_COMPAT_H_
 
diff --git a/mesalib/include/c99_math.h b/mesalib/include/c99_math.h
index 0a49950cf..5b01d53a8 100644
--- a/mesalib/include/c99_math.h
+++ b/mesalib/include/c99_math.h
@@ -71,6 +71,7 @@ roundf(float x)
 #endif
 
 #ifndef INFINITY
+#include <float.h> // DBL_MAX
 #define INFINITY (DBL_MAX + DBL_MAX)
 #endif
 
@@ -161,4 +162,48 @@ llrintf(float f)
 #endif
 
 
+#if defined(fpclassify)
+/* ISO C99 says that fpclassify is a macro.  Assume that any implementation
+ * of fpclassify, whether it's in a C99 compiler or not, will be a macro.
+ */
+#elif defined(__cplusplus)
+/* For C++, fpclassify() should be defined in <cmath> */
+#elif defined(_MSC_VER)
+/* Not required on VS2013 and above.  Oddly, the fpclassify() function
+ * doesn't exist in such a form on MSVC.  This is an implementation using
+ * slightly different lower-level Windows functions.
+ */
+#include <float.h>
+
+static inline enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}
+fpclassify(double x)
+{
+   switch(_fpclass(x)) {
+   case _FPCLASS_SNAN: /* signaling NaN */
+   case _FPCLASS_QNAN: /* quiet NaN */
+      return FP_NAN;
+   case _FPCLASS_NINF: /* negative infinity */
+   case _FPCLASS_PINF: /* positive infinity */
+      return FP_INFINITE;
+   case _FPCLASS_NN:   /* negative normal */
+   case _FPCLASS_PN:   /* positive normal */
+      return FP_NORMAL;
+   case _FPCLASS_ND:   /* negative denormalized */
+   case _FPCLASS_PD:   /* positive denormalized */
+      return FP_SUBNORMAL;
+   case _FPCLASS_NZ:   /* negative zero */
+   case _FPCLASS_PZ:   /* positive zero */
+      return FP_ZERO;
+   default:
+      /* Should never get here; but if we do, this will guarantee
+       * that the pattern is not treated like a number.
+       */
+      return FP_NAN;
+   }
+}
+#else
+#error "Need to include or define an fpclassify function"
+#endif
+
+
 #endif /* #define _C99_MATH_H_ */
diff --git a/mesalib/include/no_extern_c.h b/mesalib/include/no_extern_c.h
new file mode 100644
index 000000000..f79602c03
--- /dev/null
+++ b/mesalib/include/no_extern_c.h
@@ -0,0 +1,48 @@
+/**************************************************************************
+ *
+ * Copyright 2014 VMware, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+
+/*
+ * Including system's headers inside `extern "C" { ... }` is not safe, as system
+ * headers may have C++ code in them, and C++ code inside extern "C"
+ * leads to syntatically incorrect code.
+ *
+ * This is because putting code inside extern "C" won't make __cplusplus define
+ * go away, that is, the system header being included thinks is free to use C++
+ * as it sees fits.
+ *
+ * Including non-system headers inside extern "C"  is not safe either, because
+ * non-system headers end up including system headers, hence fall in the above
+ * case too.
+ *
+ * Conclusion, includes inside extern "C" is simply not portable.
+ *
+ *
+ * This header helps surface these issues.
+ */
+
+#ifdef __cplusplus
+template<class T> class _IncludeInsideExternCNotPortable;
+#endif
diff --git a/mesalib/m4/ax_check_python_mako_module.m4 b/mesalib/m4/ax_check_python_mako_module.m4
index 2fc029b9a..ee68a7cdb 100644
--- a/mesalib/m4/ax_check_python_mako_module.m4
+++ b/mesalib/m4/ax_check_python_mako_module.m4
@@ -54,8 +54,8 @@ else:
     " | $PYTHON2 -
 
     if test $? -ne 0 ; then
-       AC_MSG_ERROR(mako $1 or later is required.)
+       AC_SUBST(acv_mako_found, 'no')
     else
-        AC_MSG_RESULT(yes)
+       AC_SUBST(acv_mako_found, 'yes')
     fi
 ])
diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py
index 7533f0651..efc65e718 100644
--- a/mesalib/scons/gallium.py
+++ b/mesalib/scons/gallium.py
@@ -35,7 +35,7 @@ import os
 import os.path
 import re
 import subprocess
-import platform as _platform
+import platform as host_platform
 import sys
 import tempfile
 
@@ -147,6 +147,17 @@ def check_cc(env, cc, expr, cpp_opt = '-E'):
     return result
 
 
+def check_prog(env, prog):
+    """Check whether this program exists."""
+
+    sys.stdout.write('Checking for %s ... ' % prog)
+
+    result = env.Detect(prog)
+
+    sys.stdout.write(' %s\n' % ['no', 'yes'][int(bool(result))])
+    return result
+
+
 def generate(env):
     """Common environment generation code"""
 
@@ -186,7 +197,7 @@ def generate(env):
     env['gcc'] = 0
     env['clang'] = 0
     env['msvc'] = 0
-    if _platform.system() == 'Windows':
+    if host_platform.system() == 'Windows':
         env['msvc'] = check_cc(env, 'MSVC', 'defined(_MSC_VER)', '/E')
     if not env['msvc']:
         env['gcc'] = check_cc(env, 'GCC', 'defined(__GNUC__) && !defined(__clang__)')
@@ -210,10 +221,10 @@ def generate(env):
 
     # Determine whether we are cross compiling; in particular, whether we need
     # to compile code generators with a different compiler as the target code.
-    host_platform = _platform.system().lower()
-    if host_platform.startswith('cygwin'):
-        host_platform = 'cygwin'
-    host_machine = os.environ.get('PROCESSOR_ARCHITEW6432', os.environ.get('PROCESSOR_ARCHITECTURE', _platform.machine()))
+    hosthost_platform = host_platform.system().lower()
+    if hosthost_platform.startswith('cygwin'):
+        hosthost_platform = 'cygwin'
+    host_machine = os.environ.get('PROCESSOR_ARCHITEW6432', os.environ.get('PROCESSOR_ARCHITECTURE', host_platform.machine()))
     host_machine = {
         'x86': 'x86',
         'i386': 'x86',
@@ -224,7 +235,7 @@ def generate(env):
         'AMD64': 'x86_64',
         'x86_64': 'x86_64',
     }.get(host_machine, 'generic')
-    env['crosscompile'] = platform != host_platform
+    env['crosscompile'] = platform != hosthost_platform
     if machine == 'x86_64' and host_machine != 'x86_64':
         env['crosscompile'] = True
     env['hostonly'] = False
@@ -351,6 +362,7 @@ def generate(env):
                 '_SCL_SECURE_NO_WARNINGS',
                 '_SCL_SECURE_NO_DEPRECATE',
                 '_ALLOW_KEYWORD_MACROS',
+                '_HAS_EXCEPTIONS=0', # Tell C++ STL to not use exceptions
             ]
         if env['build'] in ('debug', 'checked'):
             cppdefines += ['_DEBUG']
@@ -369,6 +381,7 @@ def generate(env):
             'HAVE___BUILTIN_FFS',
             'HAVE___BUILTIN_FFSLL',
             'HAVE_FUNC_ATTRIBUTE_FLATTEN',
+            'HAVE_FUNC_ATTRIBUTE_UNUSED',
             # GCC 3.0
             'HAVE_FUNC_ATTRIBUTE_FORMAT',
             'HAVE_FUNC_ATTRIBUTE_PACKED',
@@ -493,8 +506,13 @@ def generate(env):
             ]
         ccflags += [
             '/W3', # warning level
+            '/wd4018', # signed/unsigned mismatch
+            '/wd4056', # overflow in floating-point constant arithmetic
             '/wd4244', # conversion from 'type1' to 'type2', possible loss of data
+            '/wd4267', # 'var' : conversion from 'size_t' to 'type', possible loss of data
             '/wd4305', # truncation from 'type1' to 'type2'
+            '/wd4351', # new behavior: elements of array 'array' will be default initialized
+            '/wd4756', # overflow in constant arithmetic
             '/wd4800', # forcing value to bool 'true' or 'false' (performance warning)
             '/wd4996', # disable deprecated POSIX name warnings
         ]
@@ -617,7 +635,37 @@ def generate(env):
 
     # Load tools
     env.Tool('lex')
+    if env['msvc']:
+        env.Append(LEXFLAGS = [
+            # Force flex to use const keyword in prototypes, as relies on
+            # __cplusplus or __STDC__ macro to determine whether it's safe to
+            # use const keyword, but MSVC never defines __STDC__ unless we
+            # disable all MSVC extensions.
+            '-DYY_USE_CONST=',
+        ])
+        # Flex relies on __STDC_VERSION__>=199901L to decide when to include
+        # C99 inttypes.h.  We always have inttypes.h available with MSVC
+        # (either the one bundled with MSVC 2013, or the one we bundle
+        # ourselves), but we can't just define __STDC_VERSION__ without
+        # breaking stuff, as MSVC doesn't fully support C99.  There's also no
+        # way to premptively include stdint.
+        env.Append(CCFLAGS = ['-FIinttypes.h'])
+    if host_platform.system() == 'Windows':
+        # Prefer winflexbison binaries, as not only they are easier to install
+        # (no additional dependencies), but also better Windows support.
+        if check_prog(env, 'win_flex'):
+            env["LEX"] = 'win_flex'
+            env.Append(LEXFLAGS = [
+                # windows compatibility (uses <io.h> instead of <unistd.h> and
+                # _isatty, _fileno functions)
+                '--wincompat'
+            ])
+
     env.Tool('yacc')
+    if host_platform.system() == 'Windows':
+        if check_prog(env, 'win_bison'):
+            env["YACC"] = 'win_bison'
+
     if env['llvm']:
         env.Tool('llvm')
     
diff --git a/mesalib/scons/llvm.py b/mesalib/scons/llvm.py
index d145de8d8..be7df9fad 100644
--- a/mesalib/scons/llvm.py
+++ b/mesalib/scons/llvm.py
@@ -132,6 +132,11 @@ def generate(env):
             # Some of the LLVM C headers use the inline keyword without
             # defining it.
             env.Append(CPPDEFINES = [('inline', '__inline')])
+            # Match some of the warning options from llvm/cmake/modules/HandleLLVMOptions.cmake
+            env.AppendUnique(CXXFLAGS = [
+                '/wd4355', # 'this' : used in base member initializer list
+                '/wd4624', # 'derived class' : destructor could not be generated because a base class destructor is inaccessible
+            ])
             if env['build'] in ('debug', 'checked'):
                 # LLVM libraries are static, build with /MT, and they
                 # automatically link agains LIBCMT. When we're doing a
diff --git a/mesalib/src/gallium/Makefile.am b/mesalib/src/gallium/Makefile.am
index 652cb1310..ede6e2123 100644
--- a/mesalib/src/gallium/Makefile.am
+++ b/mesalib/src/gallium/Makefile.am
@@ -11,7 +11,6 @@ SUBDIRS += auxiliary
 ##
 
 SUBDIRS += \
-	drivers/galahad \
 	drivers/noop \
 	drivers/trace \
 	drivers/rbug
@@ -96,14 +95,6 @@ if HAVE_DRI2
 SUBDIRS += winsys/sw/kms-dri
 endif
 
-if HAVE_EGL_PLATFORM_FBDEV
-SUBDIRS += winsys/sw/fbdev
-endif
-
-if HAVE_EGL_PLATFORM_WAYLAND
-SUBDIRS += winsys/sw/wayland
-endif
-
 SUBDIRS += winsys/sw/wrapper
 
 ##
@@ -114,8 +105,6 @@ EXTRA_DIST = \
 	docs \
 	README.portability \
 	SConscript \
-	state_trackers/gbm \
-	targets/gbm \
 	winsys/sw/gdi \
 	winsys/sw/hgl
 
diff --git a/mesalib/src/gallium/SConscript b/mesalib/src/gallium/SConscript
index 9b9011f7f..680ad925f 100644
--- a/mesalib/src/gallium/SConscript
+++ b/mesalib/src/gallium/SConscript
@@ -12,7 +12,6 @@ SConscript('auxiliary/SConscript')
 
 # These are common and work across all platforms
 SConscript([
-    'drivers/galahad/SConscript',
     'drivers/llvmpipe/SConscript',
     'drivers/rbug/SConscript',
     'drivers/softpipe/SConscript',
diff --git a/mesalib/src/gallium/auxiliary/util/u_slab.h b/mesalib/src/gallium/auxiliary/util/u_slab.h
index 29d0252ba..0df039bcd 100644
--- a/mesalib/src/gallium/auxiliary/util/u_slab.h
+++ b/mesalib/src/gallium/auxiliary/util/u_slab.h
@@ -81,7 +81,16 @@ void util_slab_destroy(struct util_slab_mempool *pool);
 void util_slab_set_thread_safety(struct util_slab_mempool *pool,
                                  enum util_slab_threading threading);
 
-#define util_slab_alloc(pool)     (pool)->alloc(pool)
-#define util_slab_free(pool, ptr) (pool)->free(pool, ptr)
+static inline void *
+util_slab_alloc(struct util_slab_mempool *pool)
+{
+   return pool->alloc(pool);
+}
+
+static inline void
+util_slab_free(struct util_slab_mempool *pool, void *ptr)
+{
+   pool->free(pool, ptr);
+}
 
 #endif
diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript
index 26de455f0..284b37584 100644
--- a/mesalib/src/glsl/SConscript
+++ b/mesalib/src/glsl/SConscript
@@ -24,22 +24,26 @@ env.Prepend(LIBS = [mesautil])
 # Make glcpp-parse.h and glsl_parser.h reachable from the include path.
 env.Append(CPPPATH = [Dir('.').abspath, Dir('glcpp').abspath])
 
-env.Append(YACCFLAGS = '-d -p "glcpp_parser_"')
+glcpp_env = env.Clone()
+glcpp_env.Append(YACCFLAGS = [
+    '-d',
+    '-p', 'glcpp_parser_'
+])
 
-parser_env = env.Clone()
-parser_env.Append(YACCFLAGS = [
+glsl_env = env.Clone()
+glsl_env.Append(YACCFLAGS = [
     '--defines=%s' % File('glsl_parser.h').abspath,
     '-p', '_mesa_glsl_',
 ])
 
 # without this line scons will expect "glsl_parser.hpp" instead of
 # "glsl_parser.h", causing glsl_parser.cpp to be regenerated every time
-parser_env['YACCHXXFILESUFFIX'] = '.h'
+glsl_env['YACCHXXFILESUFFIX'] = '.h'
 
-glcpp_lexer = env.CFile('glcpp/glcpp-lex.c', 'glcpp/glcpp-lex.l')
-glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')
-glsl_lexer = parser_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll')
-glsl_parser = parser_env.CXXFile('glsl_parser.cpp', 'glsl_parser.yy')
+glcpp_lexer = glcpp_env.CFile('glcpp/glcpp-lex.c', 'glcpp/glcpp-lex.l')
+glcpp_parser = glcpp_env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')
+glsl_lexer = glsl_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll')
+glsl_parser = glsl_env.CXXFile('glsl_parser.cpp', 'glsl_parser.yy')
 
 # common generated sources
 glsl_sources = [
diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index acb5c763c..d387b2e35 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -1617,6 +1617,12 @@ ast_expression::do_hir(exec_list *instructions,
           && cond_val != NULL) {
          result = cond_val->value.b[0] ? op[1] : op[2];
       } else {
+         /* The copy to conditional_tmp reads the whole array. */
+         if (type->is_array()) {
+            mark_whole_array_access(op[1]);
+            mark_whole_array_access(op[2]);
+         }
+
          ir_variable *const tmp =
             new(ctx) ir_variable(type, "conditional_tmp", ir_var_temporary);
          instructions->push_tail(tmp);
diff --git a/mesalib/src/glsl/builtin_functions.cpp b/mesalib/src/glsl/builtin_functions.cpp
index 28bcfdb3c..e46db8552 100755
--- a/mesalib/src/glsl/builtin_functions.cpp
+++ b/mesalib/src/glsl/builtin_functions.cpp
@@ -201,7 +201,7 @@ static bool
 shader_packing_or_es3(const _mesa_glsl_parse_state *state)
 {
    return state->ARB_shading_language_packing_enable ||
-          state->is_version(400, 300);
+          state->is_version(420, 300);
 }
 
 static bool
diff --git a/mesalib/src/glsl/glsl_parser.yy b/mesalib/src/glsl/glsl_parser.yy
index 4a2ebeb40..d33fcfe6b 100644
--- a/mesalib/src/glsl/glsl_parser.yy
+++ b/mesalib/src/glsl/glsl_parser.yy
@@ -35,6 +35,10 @@
 #include "glsl_types.h"
 #include "main/context.h"
 
+#ifdef _MSC_VER
+#pragma warning( disable : 4065 ) // switch statement contains 'default' but no 'case' labels
+#endif
+
 #undef yyerror
 
 static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state *st, const char *msg)
diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h
index 25f2ecada..fdc22edf1 100644
--- a/mesalib/src/glsl/ir.h
+++ b/mesalib/src/glsl/ir.h
@@ -119,6 +119,7 @@ public:
    /*@{*/
    class ir_rvalue *as_rvalue()
    {
+      assume(this != NULL);
       if (ir_type == ir_type_dereference_array ||
           ir_type == ir_type_dereference_record ||
           ir_type == ir_type_dereference_variable ||
@@ -132,6 +133,7 @@ public:
 
    class ir_dereference *as_dereference()
    {
+      assume(this != NULL);
       if (ir_type == ir_type_dereference_array ||
           ir_type == ir_type_dereference_record ||
           ir_type == ir_type_dereference_variable)
@@ -141,6 +143,7 @@ public:
 
    class ir_jump *as_jump()
    {
+      assume(this != NULL);
       if (ir_type == ir_type_loop_jump ||
           ir_type == ir_type_return ||
           ir_type == ir_type_discard)
@@ -151,6 +154,7 @@ public:
    #define AS_CHILD(TYPE) \
    class ir_##TYPE * as_##TYPE() \
    { \
+      assume(this != NULL);                                         \
       return ir_type == ir_type_##TYPE ? (ir_##TYPE *) this : NULL; \
    }
    AS_CHILD(variable)
diff --git a/mesalib/src/glsl/ir_constant_expression.cpp b/mesalib/src/glsl/ir_constant_expression.cpp
index e24cad98d..d198276c6 100755
--- a/mesalib/src/glsl/ir_constant_expression.cpp
+++ b/mesalib/src/glsl/ir_constant_expression.cpp
@@ -35,6 +35,7 @@
 
 #include <math.h>
 #include "main/core.h" /* for MAX2, MIN2, CLAMP */
+#include "util/rounding.h" /* for _mesa_roundeven */
 #include "ir.h"
 #include "glsl_types.h"
 #include "program/hash_table.h"
@@ -238,8 +239,8 @@ pack_snorm_1x8(float x)
      * We must first cast the float to an int, because casting a negative
      * float to a uint is undefined.
      */
-   return (uint8_t) (int8_t)
-          _mesa_round_to_even(CLAMP(x, -1.0f, +1.0f) * 127.0f);
+   return (uint8_t) (int)
+          _mesa_roundevenf(CLAMP(x, -1.0f, +1.0f) * 127.0f);
 }
 
 /**
@@ -260,8 +261,8 @@ pack_snorm_1x16(float x)
      * We must first cast the float to an int, because casting a negative
      * float to a uint is undefined.
      */
-   return (uint16_t) (int16_t)
-          _mesa_round_to_even(CLAMP(x, -1.0f, +1.0f) * 32767.0f);
+   return (uint16_t) (int)
+          _mesa_roundevenf(CLAMP(x, -1.0f, +1.0f) * 32767.0f);
 }
 
 /**
@@ -315,7 +316,7 @@ pack_unorm_1x8(float x)
      *
      *       packUnorm4x8: round(clamp(c, 0, +1) * 255.0)
      */
-   return (uint8_t) _mesa_round_to_even(CLAMP(x, 0.0f, 1.0f) * 255.0f);
+   return (uint8_t) (int) _mesa_roundevenf(CLAMP(x, 0.0f, 1.0f) * 255.0f);
 }
 
 /**
@@ -333,7 +334,8 @@ pack_unorm_1x16(float x)
      *
      *       packUnorm2x16: round(clamp(c, 0, +1) * 65535.0)
      */
-   return (uint16_t) _mesa_round_to_even(CLAMP(x, 0.0f, 1.0f) * 65535.0f);
+   return (uint16_t) (int)
+          _mesa_roundevenf(CLAMP(x, 0.0f, 1.0f) * 65535.0f);
 }
 
 /**
@@ -726,9 +728,9 @@ ir_expression::constant_expression_value(struct hash_table *variable_context)
    case ir_unop_round_even:
       for (unsigned c = 0; c < op[0]->type->components(); c++) {
          if (op[0]->type->base_type == GLSL_TYPE_DOUBLE)
-            data.d[c] = _mesa_round_to_even(op[0]->value.d[c]);
+            data.d[c] = _mesa_roundeven(op[0]->value.d[c]);
          else
-            data.f[c] = _mesa_round_to_even(op[0]->value.f[c]);
+            data.f[c] = _mesa_roundevenf(op[0]->value.f[c]);
       }
       break;
 
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index 0c4467779..4349f0973 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -2542,8 +2542,9 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
 	 goto done;
       }
 
-      prog->ARB_fragment_coord_conventions_enable |=
-         prog->Shaders[i]->ARB_fragment_coord_conventions_enable;
+      if (prog->Shaders[i]->ARB_fragment_coord_conventions_enable) {
+         prog->ARB_fragment_coord_conventions_enable = true;
+      }
 
       gl_shader_stage shader_type = prog->Shaders[i]->Stage;
       shader_list[shader_type][num_shaders[shader_type]] = prog->Shaders[i];
diff --git a/mesalib/src/glsl/list.h b/mesalib/src/glsl/list.h
index 8554a4652..d855240cb 100644
--- a/mesalib/src/glsl/list.h
+++ b/mesalib/src/glsl/list.h
@@ -692,7 +692,7 @@ inline void exec_node::insert_before(exec_list *before)
            exec_node_data(__type, (__list)->head, __field),                \
                * __next =                                                  \
            exec_node_data(__type, (__node)->__field.next, __field);        \
-        __next != NULL;                                                    \
+        (__node)->__field.next != NULL;                                    \
         __node = __next, __next =                                          \
            exec_node_data(__type, (__next)->__field.next, __field))
 
@@ -701,7 +701,7 @@ inline void exec_node::insert_before(exec_list *before)
            exec_node_data(__type, (__list)->tail_pred, __field),           \
                * __prev =                                                  \
            exec_node_data(__type, (__node)->__field.prev, __field);        \
-        __prev != NULL;                                                    \
+        (__node)->__field.prev != NULL;                                    \
         __node = __prev, __prev =                                          \
            exec_node_data(__type, (__prev)->__field.prev, __field))
 
diff --git a/mesalib/src/glsl/nir/glsl_to_nir.cpp b/mesalib/src/glsl/nir/glsl_to_nir.cpp
index adef19c80..357944da6 100644
--- a/mesalib/src/glsl/nir/glsl_to_nir.cpp
+++ b/mesalib/src/glsl/nir/glsl_to_nir.cpp
@@ -43,7 +43,7 @@ namespace {
 class nir_visitor : public ir_visitor
 {
 public:
-   nir_visitor(nir_shader *shader, bool supports_ints);
+   nir_visitor(nir_shader *shader, gl_shader_stage stage);
    ~nir_visitor();
 
    virtual void visit(ir_variable *);
@@ -83,6 +83,7 @@ private:
    bool supports_ints;
 
    nir_shader *shader;
+   gl_shader_stage stage;
    nir_function_impl *impl;
    exec_list *cf_node_list;
    nir_instr *result; /* result of the expression tree last visited */
@@ -124,59 +125,24 @@ private:
 
 }; /* end of anonymous namespace */
 
-static const nir_shader_compiler_options default_options = {
-};
-
 nir_shader *
-glsl_to_nir(exec_list *ir, _mesa_glsl_parse_state *state,
-            bool native_integers)
+glsl_to_nir(struct gl_shader *sh, const nir_shader_compiler_options *options)
 {
-   const nir_shader_compiler_options *options;
-
-   if (state) {
-      struct gl_context *ctx = state->ctx;
-      struct gl_shader_compiler_options *gl_options =
-         &ctx->Const.ShaderCompilerOptions[state->stage];
-
-      if (!gl_options->NirOptions) {
-         nir_shader_compiler_options *new_options =
-            rzalloc(ctx, nir_shader_compiler_options);
-         options = gl_options->NirOptions = new_options;
-
-         if (gl_options->EmitNoPow)
-            new_options->lower_fpow = true;
-      } else {
-         options = gl_options->NirOptions;
-      }
-   } else {
-      options = &default_options;
-   }
-
    nir_shader *shader = nir_shader_create(NULL, options);
 
-   if (state) {
-      shader->num_user_structures = state->num_user_structures;
-      shader->user_structures = ralloc_array(shader, glsl_type *,
-                                             shader->num_user_structures);
-      memcpy(shader->user_structures, state->user_structures,
-            shader->num_user_structures * sizeof(glsl_type *));
-   } else {
-      shader->num_user_structures = 0;
-      shader->user_structures = NULL;
-   }
-
-   nir_visitor v1(shader, native_integers);
+   nir_visitor v1(shader, sh->Stage);
    nir_function_visitor v2(&v1);
-   v2.run(ir);
-   visit_exec_list(ir, &v1);
+   v2.run(sh->ir);
+   visit_exec_list(sh->ir, &v1);
 
    return shader;
 }
 
-nir_visitor::nir_visitor(nir_shader *shader, bool supports_ints)
+nir_visitor::nir_visitor(nir_shader *shader, gl_shader_stage stage)
 {
-   this->supports_ints = supports_ints;
+   this->supports_ints = shader->options->native_integers;
    this->shader = shader;
+   this->stage = stage;
    this->is_global = true;
    this->var_table = _mesa_hash_table_create(NULL, _mesa_hash_pointer,
                                              _mesa_key_pointer_equal);
@@ -285,7 +251,8 @@ nir_visitor::visit(ir_variable *ir)
       break;
 
    case ir_var_shader_in:
-      if (ir->data.location == VARYING_SLOT_FACE) {
+      if (stage == MESA_SHADER_FRAGMENT &&
+          ir->data.location == VARYING_SLOT_FACE) {
          /* For whatever reason, GLSL IR makes gl_FrontFacing an input */
          var->data.location = SYSTEM_VALUE_FRONT_FACE;
          var->data.mode = nir_var_system_value;
@@ -385,15 +352,15 @@ nir_visitor::visit(ir_variable *ir)
       break;
 
    case nir_var_shader_in:
-      _mesa_hash_table_insert(shader->inputs, var->name, var);
+      exec_list_push_tail(&shader->inputs, &var->node);
       break;
 
    case nir_var_shader_out:
-      _mesa_hash_table_insert(shader->outputs, var->name, var);
+      exec_list_push_tail(&shader->outputs, &var->node);
       break;
 
    case nir_var_uniform:
-      _mesa_hash_table_insert(shader->uniforms, var->name, var);
+      exec_list_push_tail(&shader->uniforms, &var->node);
       break;
 
    case nir_var_system_value:
diff --git a/mesalib/src/glsl/nir/glsl_to_nir.h b/mesalib/src/glsl/nir/glsl_to_nir.h
index 58b2cee6a..3801e8c55 100644
--- a/mesalib/src/glsl/nir/glsl_to_nir.h
+++ b/mesalib/src/glsl/nir/glsl_to_nir.h
@@ -32,8 +32,8 @@
 extern "C" {
 #endif
 
-nir_shader *glsl_to_nir(exec_list * ir, _mesa_glsl_parse_state *state,
-                        bool native_integers);
+nir_shader *glsl_to_nir(struct gl_shader *sh,
+                        const nir_shader_compiler_options *options);
 
 #ifdef __cplusplus
 }
diff --git a/mesalib/src/glsl/nir/nir.c b/mesalib/src/glsl/nir/nir.c
index ab57fd4e2..6459d5108 100644
--- a/mesalib/src/glsl/nir/nir.c
+++ b/mesalib/src/glsl/nir/nir.c
@@ -33,18 +33,12 @@ nir_shader_create(void *mem_ctx, const nir_shader_compiler_options *options)
 {
    nir_shader *shader = ralloc(mem_ctx, nir_shader);
 
-   shader->uniforms = _mesa_hash_table_create(shader, _mesa_key_hash_string,
-                                              _mesa_key_string_equal);
-   shader->inputs = _mesa_hash_table_create(shader, _mesa_key_hash_string,
-                                            _mesa_key_string_equal);
-   shader->outputs = _mesa_hash_table_create(shader, _mesa_key_hash_string,
-                                             _mesa_key_string_equal);
+   exec_list_make_empty(&shader->uniforms);
+   exec_list_make_empty(&shader->inputs);
+   exec_list_make_empty(&shader->outputs);
 
    shader->options = options;
 
-   shader->num_user_structures = 0;
-   shader->user_structures = NULL;
-
    exec_list_make_empty(&shader->functions);
    exec_list_make_empty(&shader->registers);
    exec_list_make_empty(&shader->globals);
diff --git a/mesalib/src/glsl/nir/nir.h b/mesalib/src/glsl/nir/nir.h
index d5df59609..29fe94243 100644
--- a/mesalib/src/glsl/nir/nir.h
+++ b/mesalib/src/glsl/nir/nir.h
@@ -1370,17 +1370,23 @@ typedef struct nir_shader_compiler_options {
    bool lower_fsqrt;
    /** lowers fneg and ineg to fsub and isub. */
    bool lower_negate;
+
+   /**
+    * Does the driver support real 32-bit integers?  (Otherwise, integers
+    * are simulated by floats.)
+    */
+   bool native_integers;
 } nir_shader_compiler_options;
 
 typedef struct nir_shader {
    /** hash table of name -> uniform nir_variable */
-   struct hash_table *uniforms;
+   struct exec_list uniforms;
 
    /** hash table of name -> input nir_variable */
-   struct hash_table *inputs;
+   struct exec_list inputs;
 
    /** hash table of name -> output nir_variable */
-   struct hash_table *outputs;
+   struct exec_list outputs;
 
    /** Set of driver-specific options for the shader.
     *
@@ -1400,10 +1406,6 @@ typedef struct nir_shader {
    /** list of global register in the shader */
    struct exec_list registers;
 
-   /** structures used in this shader */
-   unsigned num_user_structures;
-   struct glsl_type **user_structures;
-
    /** next available global register index */
    unsigned reg_alloc;
 
@@ -1575,6 +1577,13 @@ void nir_lower_global_vars_to_local(nir_shader *shader);
 
 void nir_lower_locals_to_regs(nir_shader *shader);
 
+void nir_assign_var_locations_scalar(struct exec_list *var_list,
+                                     unsigned *size);
+void nir_assign_var_locations_scalar_direct_first(nir_shader *shader,
+                                                  struct exec_list *var_list,
+                                                  unsigned *direct_size,
+                                                  unsigned *size);
+
 void nir_lower_io(nir_shader *shader);
 
 void nir_lower_vars_to_ssa(nir_shader *shader);
diff --git a/mesalib/src/glsl/nir/nir_constant_expressions.py b/mesalib/src/glsl/nir/nir_constant_expressions.py
index 22bc4f095..bf82fe533 100644
--- a/mesalib/src/glsl/nir/nir_constant_expressions.py
+++ b/mesalib/src/glsl/nir/nir_constant_expressions.py
@@ -28,6 +28,7 @@ template = """\
 
 #include <math.h>
 #include "main/core.h"
+#include "util/rounding.h" /* for _mesa_roundeven */
 #include "nir_constant_expressions.h"
 
 #if defined(_MSC_VER) && (_MSC_VER < 1800)
@@ -68,8 +69,8 @@ pack_snorm_1x8(float x)
      * We must first cast the float to an int, because casting a negative
      * float to a uint is undefined.
      */
-   return (uint8_t) (int8_t)
-          _mesa_round_to_even(CLAMP(x, -1.0f, +1.0f) * 127.0f);
+   return (uint8_t) (int)
+          _mesa_roundevenf(CLAMP(x, -1.0f, +1.0f) * 127.0f);
 }
 
 /**
@@ -90,8 +91,8 @@ pack_snorm_1x16(float x)
      * We must first cast the float to an int, because casting a negative
      * float to a uint is undefined.
      */
-   return (uint16_t) (int16_t)
-          _mesa_round_to_even(CLAMP(x, -1.0f, +1.0f) * 32767.0f);
+   return (uint16_t) (int)
+          _mesa_roundevenf(CLAMP(x, -1.0f, +1.0f) * 32767.0f);
 }
 
 /**
@@ -145,7 +146,8 @@ pack_unorm_1x8(float x)
      *
      *       packUnorm4x8: round(clamp(c, 0, +1) * 255.0)
      */
-   return (uint8_t) _mesa_round_to_even(CLAMP(x, 0.0f, 1.0f) * 255.0f);
+   return (uint8_t) (int)
+          _mesa_roundevenf(CLAMP(x, 0.0f, 1.0f) * 255.0f);
 }
 
 /**
@@ -163,7 +165,8 @@ pack_unorm_1x16(float x)
      *
      *       packUnorm2x16: round(clamp(c, 0, +1) * 65535.0)
      */
-   return (uint16_t) _mesa_round_to_even(CLAMP(x, 0.0f, 1.0f) * 65535.0f);
+   return (uint16_t) (int)
+          _mesa_roundevenf(CLAMP(x, 0.0f, 1.0f) * 65535.0f);
 }
 
 /**
diff --git a/mesalib/src/glsl/nir/nir_intrinsics.h b/mesalib/src/glsl/nir/nir_intrinsics.h
index 3bf102fc1..8e28765c1 100644
--- a/mesalib/src/glsl/nir/nir_intrinsics.h
+++ b/mesalib/src/glsl/nir/nir_intrinsics.h
@@ -95,6 +95,8 @@ ATOMIC(read, NIR_INTRINSIC_CAN_ELIMINATE)
 
 SYSTEM_VALUE(front_face, 1)
 SYSTEM_VALUE(vertex_id, 1)
+SYSTEM_VALUE(vertex_id_zero_base, 1)
+SYSTEM_VALUE(base_vertex, 1)
 SYSTEM_VALUE(instance_id, 1)
 SYSTEM_VALUE(sample_id, 1)
 SYSTEM_VALUE(sample_pos, 2)
diff --git a/mesalib/src/glsl/nir/nir_lower_io.c b/mesalib/src/glsl/nir/nir_lower_io.c
index 207f8daa1..03eed04e1 100644
--- a/mesalib/src/glsl/nir/nir_lower_io.c
+++ b/mesalib/src/glsl/nir/nir_lower_io.c
@@ -76,15 +76,12 @@ type_size(const struct glsl_type *type)
    return 0;
 }
 
-static void
-assign_var_locations(struct hash_table *ht, unsigned *size)
+void
+nir_assign_var_locations_scalar(struct exec_list *var_list, unsigned *size)
 {
    unsigned location = 0;
 
-   struct hash_entry *entry;
-   hash_table_foreach(ht, entry) {
-      nir_variable *var = (nir_variable *) entry->data;
-
+   foreach_list_typed(nir_variable, var, node, var_list) {
       /*
        * UBO's have their own address spaces, so don't count them towards the
        * number of global uniforms
@@ -99,14 +96,6 @@ assign_var_locations(struct hash_table *ht, unsigned *size)
    *size = location;
 }
 
-static void
-assign_var_locations_shader(nir_shader *shader)
-{
-   assign_var_locations(shader->inputs, &shader->num_inputs);
-   assign_var_locations(shader->outputs, &shader->num_outputs);
-   assign_var_locations(shader->uniforms, &shader->num_uniforms);
-}
-
 static bool
 deref_has_indirect(nir_deref_var *deref)
 {
@@ -121,6 +110,77 @@ deref_has_indirect(nir_deref_var *deref)
    return false;
 }
 
+static bool
+mark_indirect_uses_block(nir_block *block, void *void_state)
+{
+   struct set *indirect_set = void_state;
+
+   nir_foreach_instr(block, instr) {
+      if (instr->type != nir_instr_type_intrinsic)
+         continue;
+
+      nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
+
+      for (unsigned i = 0;
+           i < nir_intrinsic_infos[intrin->intrinsic].num_variables; i++) {
+         if (deref_has_indirect(intrin->variables[i]))
+            _mesa_set_add(indirect_set, intrin->variables[i]->var);
+      }
+   }
+
+   return true;
+}
+
+/* Identical to nir_assign_var_locations_packed except that it assigns
+ * locations to the variables that are used 100% directly first and then
+ * assigns locations to variables that are used indirectly.
+ */
+void
+nir_assign_var_locations_scalar_direct_first(nir_shader *shader,
+                                             struct exec_list *var_list,
+                                             unsigned *direct_size,
+                                             unsigned *size)
+{
+   struct set *indirect_set = _mesa_set_create(NULL, _mesa_hash_pointer,
+                                               _mesa_key_pointer_equal);
+
+   nir_foreach_overload(shader, overload) {
+      if (overload->impl)
+         nir_foreach_block(overload->impl, mark_indirect_uses_block,
+                           indirect_set);
+   }
+
+   unsigned location = 0;
+
+   foreach_list_typed(nir_variable, var, node, var_list) {
+      if (var->data.mode == nir_var_uniform && var->interface_type != NULL)
+         continue;
+
+      if (_mesa_set_search(indirect_set, var))
+         continue;
+
+      var->data.driver_location = location;
+      location += type_size(var->type);
+   }
+
+   *direct_size = location;
+
+   foreach_list_typed(nir_variable, var, node, var_list) {
+      if (var->data.mode == nir_var_uniform && var->interface_type != NULL)
+         continue;
+
+      if (!_mesa_set_search(indirect_set, var))
+         continue;
+
+      var->data.driver_location = location;
+      location += type_size(var->type);
+   }
+
+   *size = location;
+
+   _mesa_set_destroy(indirect_set, NULL);
+}
+
 static unsigned
 get_io_offset(nir_deref_var *deref, nir_instr *instr, nir_src *indirect,
               struct lower_io_state *state)
@@ -307,8 +367,6 @@ nir_lower_io_impl(nir_function_impl *impl)
 void
 nir_lower_io(nir_shader *shader)
 {
-   assign_var_locations_shader(shader);
-
    nir_foreach_overload(shader, overload) {
       if (overload->impl)
          nir_lower_io_impl(overload->impl);
diff --git a/mesalib/src/glsl/nir/nir_lower_system_values.c b/mesalib/src/glsl/nir/nir_lower_system_values.c
index 328d4f1ab..a6eec653e 100644
--- a/mesalib/src/glsl/nir/nir_lower_system_values.c
+++ b/mesalib/src/glsl/nir/nir_lower_system_values.c
@@ -49,6 +49,12 @@ convert_instr(nir_intrinsic_instr *instr)
    case SYSTEM_VALUE_VERTEX_ID:
       op = nir_intrinsic_load_vertex_id;
       break;
+   case SYSTEM_VALUE_VERTEX_ID_ZERO_BASE:
+      op = nir_intrinsic_load_vertex_id_zero_base;
+      break;
+   case SYSTEM_VALUE_BASE_VERTEX:
+      op = nir_intrinsic_load_base_vertex;
+      break;
    case SYSTEM_VALUE_INSTANCE_ID:
       op = nir_intrinsic_load_instance_id;
       break;
diff --git a/mesalib/src/glsl/nir/nir_lower_vars_to_ssa.c b/mesalib/src/glsl/nir/nir_lower_vars_to_ssa.c
index 9e9a418e3..86e6ab416 100644
--- a/mesalib/src/glsl/nir/nir_lower_vars_to_ssa.c
+++ b/mesalib/src/glsl/nir/nir_lower_vars_to_ssa.c
@@ -35,6 +35,13 @@ struct deref_node {
 
    bool lower_to_ssa;
 
+   /* Only valid for things that end up in the direct list.
+    * Note that multiple nir_deref_vars may correspond to this node, but they
+    * will all be equivalent, so any is as good as the other.
+    */
+   nir_deref_var *deref;
+   struct exec_node direct_derefs_link;
+
    struct set *loads;
    struct set *stores;
    struct set *copies;
@@ -69,7 +76,7 @@ struct lower_variables_state {
     * wildcards and no indirects, these are precisely the derefs that we
     * can actually consider lowering.
     */
-   struct hash_table *direct_deref_nodes;
+   struct exec_list direct_deref_nodes;
 
    /* Controls whether get_deref_node will add variables to the
     * direct_deref_nodes table.  This is turned on when we are initially
@@ -83,88 +90,6 @@ struct lower_variables_state {
    struct hash_table *phi_table;
 };
 
-/* The following two functions implement a hash and equality check for
- * variable dreferences.  When the hash or equality function encounters an
- * array, all indirects are treated as equal and are never equal to a
- * direct dereference or a wildcard.
- */
-static uint32_t
-hash_deref(const void *void_deref)
-{
-   uint32_t hash = _mesa_fnv32_1a_offset_bias;
-
-   const nir_deref_var *deref_var = void_deref;
-   hash = _mesa_fnv32_1a_accumulate(hash, deref_var->var);
-
-   for (const nir_deref *deref = deref_var->deref.child;
-        deref; deref = deref->child) {
-      switch (deref->deref_type) {
-      case nir_deref_type_array: {
-         nir_deref_array *deref_array = nir_deref_as_array(deref);
-
-         hash = _mesa_fnv32_1a_accumulate(hash, deref_array->deref_array_type);
-
-         if (deref_array->deref_array_type == nir_deref_array_type_direct)
-            hash = _mesa_fnv32_1a_accumulate(hash, deref_array->base_offset);
-         break;
-      }
-      case nir_deref_type_struct: {
-         nir_deref_struct *deref_struct = nir_deref_as_struct(deref);
-         hash = _mesa_fnv32_1a_accumulate(hash, deref_struct->index);
-         break;
-      }
-      default:
-         assert("Invalid deref chain");
-      }
-   }
-
-   return hash;
-}
-
-static bool
-derefs_equal(const void *void_a, const void *void_b)
-{
-   const nir_deref_var *a_var = void_a;
-   const nir_deref_var *b_var = void_b;
-
-   if (a_var->var != b_var->var)
-      return false;
-
-   for (const nir_deref *a = a_var->deref.child, *b = b_var->deref.child;
-        a != NULL; a = a->child, b = b->child) {
-      if (a->deref_type != b->deref_type)
-         return false;
-
-      switch (a->deref_type) {
-      case nir_deref_type_array: {
-         nir_deref_array *a_arr = nir_deref_as_array(a);
-         nir_deref_array *b_arr = nir_deref_as_array(b);
-
-         if (a_arr->deref_array_type != b_arr->deref_array_type)
-            return false;
-
-         if (a_arr->deref_array_type == nir_deref_array_type_direct &&
-             a_arr->base_offset != b_arr->base_offset)
-            return false;
-         break;
-      }
-      case nir_deref_type_struct:
-         if (nir_deref_as_struct(a)->index != nir_deref_as_struct(b)->index)
-            return false;
-         break;
-      default:
-         assert("Invalid deref chain");
-         return false;
-      }
-
-      assert((a->child == NULL) == (b->child == NULL));
-      if((a->child == NULL) != (b->child == NULL))
-         return false;
-   }
-
-   return true;
-}
-
 static int
 type_get_length(const struct glsl_type *type)
 {
@@ -195,6 +120,8 @@ deref_node_create(struct deref_node *parent,
    struct deref_node *node = rzalloc_size(mem_ctx, size);
    node->type = type;
    node->parent = parent;
+   node->deref = NULL;
+   exec_node_init(&node->direct_derefs_link);
 
    return node;
 }
@@ -297,8 +224,14 @@ get_deref_node(nir_deref_var *deref, struct lower_variables_state *state)
 
    assert(node);
 
-   if (is_direct && state->add_to_direct_deref_nodes)
-      _mesa_hash_table_insert(state->direct_deref_nodes, deref, node);
+   /* Only insert if it isn't already in the list. */
+   if (is_direct && state->add_to_direct_deref_nodes &&
+       node->direct_derefs_link.next == NULL) {
+      node->deref = deref;
+      assert(deref->var != NULL);
+      exec_list_push_tail(&state->direct_deref_nodes,
+                          &node->direct_derefs_link);
+   }
 
    return node;
 }
@@ -917,10 +850,8 @@ insert_phi_nodes(struct lower_variables_state *state)
    unsigned w_start, w_end;
    unsigned iter_count = 0;
 
-   struct hash_entry *deref_entry;
-   hash_table_foreach(state->direct_deref_nodes, deref_entry) {
-      struct deref_node *node = deref_entry->data;
-
+   foreach_list_typed(struct deref_node, node, direct_derefs_link,
+                      &state->direct_deref_nodes) {
       if (node->stores == NULL)
          continue;
 
@@ -1014,8 +945,7 @@ nir_lower_vars_to_ssa_impl(nir_function_impl *impl)
    state.deref_var_nodes = _mesa_hash_table_create(state.dead_ctx,
                                                    _mesa_hash_pointer,
                                                    _mesa_key_pointer_equal);
-   state.direct_deref_nodes = _mesa_hash_table_create(state.dead_ctx,
-                                                      hash_deref, derefs_equal);
+   exec_list_make_empty(&state.direct_deref_nodes);
    state.phi_table = _mesa_hash_table_create(state.dead_ctx,
                                              _mesa_hash_pointer,
                                              _mesa_key_pointer_equal);
@@ -1035,18 +965,17 @@ nir_lower_vars_to_ssa_impl(nir_function_impl *impl)
    /* We're about to iterate through direct_deref_nodes.  Don't modify it. */
    state.add_to_direct_deref_nodes = false;
 
-   struct hash_entry *entry;
-   hash_table_foreach(state.direct_deref_nodes, entry) {
-      nir_deref_var *deref = (void *)entry->key;
-      struct deref_node *node = entry->data;
+   foreach_list_typed_safe(struct deref_node, node, direct_derefs_link,
+                           &state.direct_deref_nodes) {
+      nir_deref_var *deref = node->deref;
 
       if (deref->var->data.mode != nir_var_local) {
-         _mesa_hash_table_remove(state.direct_deref_nodes, entry);
+         exec_node_remove(&node->direct_derefs_link);
          continue;
       }
 
       if (deref_may_be_aliased(deref, &state)) {
-         _mesa_hash_table_remove(state.direct_deref_nodes, entry);
+         exec_node_remove(&node->direct_derefs_link);
          continue;
       }
 
diff --git a/mesalib/src/glsl/nir/nir_opcodes.py b/mesalib/src/glsl/nir/nir_opcodes.py
index 77f3bb826..062cd628b 100644
--- a/mesalib/src/glsl/nir/nir_opcodes.py
+++ b/mesalib/src/glsl/nir/nir_opcodes.py
@@ -183,7 +183,7 @@ unop("ftrunc", tfloat, "truncf(src0)")
 unop("fceil", tfloat, "ceilf(src0)")
 unop("ffloor", tfloat, "floorf(src0)")
 unop("ffract", tfloat, "src0 - floorf(src0)")
-unop("fround_even", tfloat, "_mesa_round_to_even(src0)")
+unop("fround_even", tfloat, "_mesa_roundevenf(src0)")
 
 
 # Trigonometric operations.
diff --git a/mesalib/src/glsl/nir/nir_opt_algebraic.py b/mesalib/src/glsl/nir/nir_opt_algebraic.py
index 7bf643134..ef855aa77 100644
--- a/mesalib/src/glsl/nir/nir_opt_algebraic.py
+++ b/mesalib/src/glsl/nir/nir_opt_algebraic.py
@@ -56,6 +56,10 @@ optimizations = [
    (('iabs', ('ineg', a)), ('iabs', a)),
    (('fadd', a, 0.0), a),
    (('iadd', a, 0), a),
+   (('fadd', ('fmul', a, b), ('fmul', a, c)), ('fmul', a, ('fadd', b, c))),
+   (('iadd', ('imul', a, b), ('imul', a, c)), ('imul', a, ('iadd', b, c))),
+   (('fadd', ('fneg', a), a), 0.0),
+   (('iadd', ('ineg', a), a), 0),
    (('fmul', a, 0.0), 0.0),
    (('imul', a, 0), 0),
    (('fmul', a, 1.0), a),
diff --git a/mesalib/src/glsl/nir/nir_opt_peephole_select.c b/mesalib/src/glsl/nir/nir_opt_peephole_select.c
index ab08f286f..b89451b09 100644
--- a/mesalib/src/glsl/nir/nir_opt_peephole_select.c
+++ b/mesalib/src/glsl/nir/nir_opt_peephole_select.c
@@ -52,36 +52,66 @@ struct peephole_select_state {
 };
 
 static bool
-are_all_move_to_phi(nir_block *block)
+block_check_for_allowed_instrs(nir_block *block)
 {
    nir_foreach_instr(block, instr) {
-      if (instr->type != nir_instr_type_alu)
-         return false;
+      switch (instr->type) {
+      case nir_instr_type_intrinsic: {
+         nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
+
+         switch (intrin->intrinsic) {
+         case nir_intrinsic_load_var:
+            switch (intrin->variables[0]->var->data.mode) {
+            case nir_var_shader_in:
+            case nir_var_uniform:
+               break;
+
+            default:
+               return false;
+            }
+            break;
+
+         default:
+            return false;
+         }
 
-      /* It must be a move operation */
-      nir_alu_instr *mov = nir_instr_as_alu(instr);
-      if (mov->op != nir_op_fmov && mov->op != nir_op_imov)
-         return false;
+         break;
+      }
 
-      /* Can't handle saturate */
-      if (mov->dest.saturate)
-         return false;
+      case nir_instr_type_load_const:
+         break;
 
-      /* It must be SSA */
-      if (!mov->dest.dest.is_ssa)
-         return false;
+      case nir_instr_type_alu: {
+         /* It must be a move operation */
+         nir_alu_instr *mov = nir_instr_as_alu(instr);
+         if (mov->op != nir_op_fmov && mov->op != nir_op_imov)
+            return false;
 
-      /* It cannot have any if-uses */
-      if (mov->dest.dest.ssa.if_uses->entries != 0)
-         return false;
+         /* Can't handle saturate */
+         if (mov->dest.saturate)
+            return false;
+
+         /* It must be SSA */
+         if (!mov->dest.dest.is_ssa)
+            return false;
 
-      /* The only uses of this definition must be phi's in the successor */
-      struct set_entry *entry;
-      set_foreach(mov->dest.dest.ssa.uses, entry) {
-         const nir_instr *dest_instr = entry->key;
-         if (dest_instr->type != nir_instr_type_phi ||
-             dest_instr->block != block->successors[0])
+         /* It cannot have any if-uses */
+         if (mov->dest.dest.ssa.if_uses->entries != 0)
             return false;
+
+         /* The only uses of this definition must be phi's in the successor */
+         struct set_entry *entry;
+         set_foreach(mov->dest.dest.ssa.uses, entry) {
+            const nir_instr *dest_instr = entry->key;
+            if (dest_instr->type != nir_instr_type_phi ||
+                dest_instr->block != block->successors[0])
+               return false;
+         }
+         break;
+      }
+
+      default:
+         return false;
       }
    }
 
@@ -119,8 +149,9 @@ nir_opt_peephole_select_block(nir_block *block, void *void_state)
    nir_block *then_block = nir_cf_node_as_block(then_node);
    nir_block *else_block = nir_cf_node_as_block(else_node);
 
-   /* ... and those blocks must only contain move-to-phi. */
-   if (!are_all_move_to_phi(then_block) || !are_all_move_to_phi(else_block))
+   /* ... and those blocks must only contain "allowed" instructions. */
+   if (!block_check_for_allowed_instrs(then_block) ||
+       !block_check_for_allowed_instrs(else_block))
       return true;
 
    /* At this point, we know that the previous CFG node is an if-then
@@ -129,6 +160,25 @@ nir_opt_peephole_select_block(nir_block *block, void *void_state)
     * selects.
     */
 
+   nir_block *prev_block = nir_cf_node_as_block(nir_cf_node_prev(prev_node));
+   assert(prev_block->cf_node.type == nir_cf_node_block);
+
+   /* First, we move the remaining instructions from the blocks to the
+    * block before.  We have already guaranteed that this is safe by
+    * calling block_check_for_allowed_instrs()
+    */
+   nir_foreach_instr_safe(then_block, instr) {
+      exec_node_remove(&instr->node);
+      instr->block = prev_block;
+      exec_list_push_tail(&prev_block->instr_list, &instr->node);
+   }
+
+   nir_foreach_instr_safe(else_block, instr) {
+      exec_node_remove(&instr->node);
+      instr->block = prev_block;
+      exec_list_push_tail(&prev_block->instr_list, &instr->node);
+   }
+
    nir_foreach_instr_safe(block, instr) {
       if (instr->type != nir_instr_type_phi)
          break;
@@ -145,19 +195,7 @@ nir_opt_peephole_select_block(nir_block *block, void *void_state)
          assert(src->src.is_ssa);
 
          unsigned idx = src->pred == then_block ? 1 : 2;
-
-         if (src->src.ssa->parent_instr->block == src->pred) {
-            /* We already know that this instruction must be a move with
-             * this phi's in this block as its only users.
-             */
-            nir_alu_instr *mov = nir_instr_as_alu(src->src.ssa->parent_instr);
-            assert(mov->instr.type == nir_instr_type_alu);
-            assert(mov->op == nir_op_fmov || mov->op == nir_op_imov);
-
-            nir_alu_src_copy(&sel->src[idx], &mov->src[0], state->mem_ctx);
-         } else {
-            nir_src_copy(&sel->src[idx].src, &src->src, state->mem_ctx);
-         }
+         nir_src_copy(&sel->src[idx].src, &src->src, state->mem_ctx);
       }
 
       nir_ssa_dest_init(&sel->instr, &sel->dest.dest,
diff --git a/mesalib/src/glsl/nir/nir_print.c b/mesalib/src/glsl/nir/nir_print.c
index 6a3c6a027..fa11a312e 100644
--- a/mesalib/src/glsl/nir/nir_print.c
+++ b/mesalib/src/glsl/nir/nir_print.c
@@ -228,7 +228,7 @@ print_var_decl(nir_variable *var, print_var_state *state, FILE *fp)
    if (var->data.mode == nir_var_shader_in ||
        var->data.mode == nir_var_shader_out ||
        var->data.mode == nir_var_uniform) {
-      fprintf(fp, " (%u)", var->data.driver_location);
+      fprintf(fp, " (%u, %u)", var->data.location, var->data.driver_location);
    }
 
    fprintf(fp, "\n");
@@ -844,22 +844,16 @@ nir_print_shader(nir_shader *shader, FILE *fp)
    print_var_state state;
    init_print_state(&state);
 
-   for (unsigned i = 0; i < shader->num_user_structures; i++) {
-      glsl_print_struct(shader->user_structures[i], fp);
-   }
-
-   struct hash_entry *entry;
-
-   hash_table_foreach(shader->uniforms, entry) {
-      print_var_decl((nir_variable *) entry->data, &state, fp);
+   foreach_list_typed(nir_variable, var, node, &shader->uniforms) {
+      print_var_decl(var, &state, fp);
    }
 
-   hash_table_foreach(shader->inputs, entry) {
-      print_var_decl((nir_variable *) entry->data, &state, fp);
+   foreach_list_typed(nir_variable, var, node, &shader->inputs) {
+      print_var_decl(var, &state, fp);
    }
 
-   hash_table_foreach(shader->outputs, entry) {
-      print_var_decl((nir_variable *) entry->data, &state, fp);
+   foreach_list_typed(nir_variable, var, node, &shader->outputs) {
+      print_var_decl(var, &state, fp);
    }
 
    foreach_list_typed(nir_variable, var, node, &shader->globals) {
diff --git a/mesalib/src/glsl/nir/nir_validate.c b/mesalib/src/glsl/nir/nir_validate.c
index a3fe9d620..f247ae069 100644
--- a/mesalib/src/glsl/nir/nir_validate.c
+++ b/mesalib/src/glsl/nir/nir_validate.c
@@ -931,17 +931,19 @@ nir_validate_shader(nir_shader *shader)
 
    state.shader = shader;
 
-   struct hash_entry *entry;
-   hash_table_foreach(shader->uniforms, entry) {
-      validate_var_decl((nir_variable *) entry->data, true, &state);
+   exec_list_validate(&shader->uniforms);
+   foreach_list_typed(nir_variable, var, node, &shader->uniforms) {
+      validate_var_decl(var, true, &state);
    }
 
-   hash_table_foreach(shader->inputs, entry) {
-     validate_var_decl((nir_variable *) entry->data, true, &state);
+   exec_list_validate(&shader->inputs);
+   foreach_list_typed(nir_variable, var, node, &shader->inputs) {
+     validate_var_decl(var, true, &state);
    }
 
-   hash_table_foreach(shader->outputs, entry) {
-      validate_var_decl((nir_variable *) entry->data, true, &state);
+   exec_list_validate(&shader->outputs);
+   foreach_list_typed(nir_variable, var, node, &shader->outputs) {
+     validate_var_decl(var, true, &state);
    }
 
    exec_list_validate(&shader->globals);
diff --git a/mesalib/src/glsl/nir/nir_worklist.c b/mesalib/src/glsl/nir/nir_worklist.c
index a8baae937..3087a1d23 100644
--- a/mesalib/src/glsl/nir/nir_worklist.c
+++ b/mesalib/src/glsl/nir/nir_worklist.c
@@ -82,7 +82,7 @@ nir_block_worklist_push_head(nir_block_worklist *w, nir_block *block)
 }
 
 nir_block *
-nir_block_worklist_peek_head(nir_block_worklist *w)
+nir_block_worklist_peek_head(const nir_block_worklist *w)
 {
    assert(w->count > 0);
 
@@ -114,18 +114,18 @@ nir_block_worklist_push_tail(nir_block_worklist *w, nir_block *block)
 
    w->count++;
 
-   unsigned tail = w->start = (w->start + w->count - 1) % w->size;
+   unsigned tail = (w->start + w->count - 1) % w->size;
 
    w->blocks[tail] = block;
    BITSET_SET(w->blocks_present, block->index);
 }
 
 nir_block *
-nir_block_worklist_peek_tail(nir_block_worklist *w)
+nir_block_worklist_peek_tail(const nir_block_worklist *w)
 {
    assert(w->count > 0);
 
-   unsigned tail = w->start = (w->start + w->count - 1) % w->size;
+   unsigned tail = (w->start + w->count - 1) % w->size;
 
    return w->blocks[tail];
 }
@@ -135,7 +135,7 @@ nir_block_worklist_pop_tail(nir_block_worklist *w)
 {
    assert(w->count > 0);
 
-   unsigned tail = w->start = (w->start + w->count - 1) % w->size;
+   unsigned tail = (w->start + w->count - 1) % w->size;
 
    w->count--;
 
diff --git a/mesalib/src/glsl/nir/nir_worklist.h b/mesalib/src/glsl/nir/nir_worklist.h
index d5a8568e4..829bff24a 100644
--- a/mesalib/src/glsl/nir/nir_worklist.h
+++ b/mesalib/src/glsl/nir/nir_worklist.h
@@ -74,13 +74,13 @@ nir_block_worklist_is_empty(const nir_block_worklist *w)
 
 void nir_block_worklist_push_head(nir_block_worklist *w, nir_block *block);
 
-nir_block *nir_block_worklist_peek_head(nir_block_worklist *w);
+nir_block *nir_block_worklist_peek_head(const nir_block_worklist *w);
 
 nir_block *nir_block_worklist_pop_head(nir_block_worklist *w);
 
 void nir_block_worklist_push_tail(nir_block_worklist *w, nir_block *block);
 
-nir_block *nir_block_worklist_peek_tail(nir_block_worklist *w);
+nir_block *nir_block_worklist_peek_tail(const nir_block_worklist *w);
 
 nir_block *nir_block_worklist_pop_tail(nir_block_worklist *w);
 
diff --git a/mesalib/src/glsl/opt_algebraic.cpp b/mesalib/src/glsl/opt_algebraic.cpp
index c6040bff8..69c03ea8b 100644
--- a/mesalib/src/glsl/opt_algebraic.cpp
+++ b/mesalib/src/glsl/opt_algebraic.cpp
@@ -626,9 +626,18 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
          if (!is_vec_zero(zero))
             continue;
 
-         return new(mem_ctx) ir_expression(ir->operation,
-                                           add->operands[0],
-                                           neg(add->operands[1]));
+         /* Depending of the zero position we want to optimize
+          * (0 cmp x+y) into (-x cmp y) or (x+y cmp 0) into (x cmp -y)
+          */
+         if (add_pos == 1) {
+            return new(mem_ctx) ir_expression(ir->operation,
+                                              neg(add->operands[0]),
+                                              add->operands[1]);
+         } else {
+            return new(mem_ctx) ir_expression(ir->operation,
+                                              add->operands[0],
+                                              neg(add->operands[1]));
+         }
       }
       break;
 
diff --git a/mesalib/src/loader/loader.c b/mesalib/src/loader/loader.c
index 9ff511522..17bf13360 100644
--- a/mesalib/src/loader/loader.c
+++ b/mesalib/src/loader/loader.c
@@ -64,6 +64,7 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
+#include <sys/stat.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
@@ -80,7 +81,6 @@
 #endif
 #endif
 #ifdef HAVE_SYSFS
-#include <sys/stat.h>
 #include <sys/types.h>
 #endif
 #include "loader.h"
diff --git a/mesalib/src/mapi/glapi/gen/ARB_direct_state_access.xml b/mesalib/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 2fe1638fd..641e68f71 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -7,6 +7,110 @@
    <enum name="QUERY_TARGET"    value="0x82EA"/>
    <enum name="TEXTURE_BINDING" value="0x82EB"/>
 
+   <!-- Buffer object functions -->
+
+   <function name="CreateBuffers" offset="assign">
+      <param name="n" type="GLsizei" />
+      <param name="buffers" type="GLuint *" />
+   </function>
+
+   <function name="NamedBufferStorage" offset="assign">
+      <param name="buffer" type="GLuint" />
+      <param name="size" type="GLsizeiptr" />
+      <param name="data" type="const GLvoid *" />
+      <param name="flags" type="GLbitfield" />
+   </function>
+
+   <function name="NamedBufferData" offset="assign">
+      <param name="buffer" type="GLuint" />
+      <param name="size" type="GLsizeiptr" />
+      <param name="data" type="const GLvoid *" />
+      <param name="usage" type="GLenum" />
+   </function>
+
+   <function name="NamedBufferSubData" offset="assign">
+      <param name="buffer" type="GLuint" />
+      <param name="offset" type="GLintptr" />
+      <param name="size" type="GLsizeiptr" />
+      <param name="data" type="const GLvoid *" />
+   </function>
+
+   <function name="CopyNamedBufferSubData" offset="assign">
+      <param name="readBuffer" type="GLuint" />
+      <param name="writeBuffer" type="GLuint" />
+      <param name="readOffset" type="GLintptr" />
+      <param name="writeOffset" type="GLintptr" />
+      <param name="size" type="GLsizeiptr" />
+   </function>
+
+   <function name="ClearNamedBufferData" offset="assign">
+      <param name="buffer" type="GLuint" />
+      <param name="internalformat" type="GLenum" />
+      <param name="format" type="GLenum" />
+      <param name="type" type="GLenum" />
+      <param name="data" type="const GLvoid *" />
+   </function>
+
+   <function name="ClearNamedBufferSubData" offset="assign">
+      <param name="buffer" type="GLuint" />
+      <param name="internalformat" type="GLenum" />
+      <param name="offset" type="GLintptr" />
+      <param name="size" type="GLsizeiptr" />
+      <param name="format" type="GLenum" />
+      <param name="type" type="GLenum" />
+      <param name="data" type="const GLvoid *" />
+   </function>
+
+   <function name="MapNamedBuffer" offset="assign">
+      <return type="GLvoid *" />
+      <param name="buffer" type="GLuint" />
+      <param name="access" type="GLenum" />
+   </function>
+
+   <function name="MapNamedBufferRange" offset="assign">
+      <return type="GLvoid *" />
+      <param name="buffer" type="GLuint" />
+      <param name="offset" type="GLintptr" />
+      <param name="length" type="GLsizeiptr" />
+      <param name="access" type="GLbitfield" />
+   </function>
+
+   <function name="UnmapNamedBuffer" offset="assign">
+      <return type="GLboolean" />
+      <param name="buffer" type="GLuint" />
+   </function>
+
+   <function name="FlushMappedNamedBufferRange" offset="assign">
+      <param name="buffer" type="GLuint" />
+      <param name="offset" type="GLintptr" />
+      <param name="length" type="GLsizeiptr" />
+   </function>
+
+   <function name="GetNamedBufferParameteriv" offset="assign">
+      <param name="buffer" type="GLuint" />
+      <param name="pname" type="GLenum" />
+      <param name="params" type="GLint *" />
+   </function>
+
+   <function name="GetNamedBufferParameteri64v" offset="assign">
+      <param name="buffer" type="GLuint" />
+      <param name="pname" type="GLenum" />
+      <param name="params" type="GLint64 *" />
+   </function>
+
+   <function name="GetNamedBufferPointerv" offset="assign">
+      <param name="buffer" type="GLuint" />
+      <param name="pname" type="GLenum" />
+      <param name="params" type="GLvoid **" />
+   </function>
+
+   <function name="GetNamedBufferSubData" offset="assign">
+      <param name="buffer" type="GLuint" />
+      <param name="offset" type="GLintptr" />
+      <param name="size" type="GLsizeiptr" />
+      <param name="data" type="GLvoid *" />
+   </function>
+
    <!-- Texture object functions -->
 
    <function name="CreateTextures" offset="assign">
@@ -21,6 +125,14 @@
       <param name="buffer" type="GLuint" />
    </function>
 
+   <function name="TextureBufferRange" offset="assign">
+      <param name="texture" type="GLuint" />
+      <param name="internalformat" type="GLenum" />
+      <param name="buffer" type="GLuint" />
+      <param name="offset" type="GLintptr" />
+      <param name="size" type="GLsizeiptr" />
+   </function>
+
    <function name="TextureStorage1D" offset="assign">
       <param name="texture" type="GLuint" />
       <param name="levels" type="GLsizei" />
diff --git a/mesalib/src/mapi/glapi/gen/gl_enums.py b/mesalib/src/mapi/glapi/gen/gl_enums.py
index a756ad971..7c55ee443 100755
--- a/mesalib/src/mapi/glapi/gen/gl_enums.py
+++ b/mesalib/src/mapi/glapi/gen/gl_enums.py
@@ -157,6 +157,12 @@ _mesa_lookup_prim_by_nr(GLuint nr)
 
         string_offsets = {}
         i = 0;
+        print '#if defined(__GNUC__)'
+        print '# define LONGSTRING __extension__'
+        print '#else'
+        print '# define LONGSTRING'
+        print '#endif'
+        print ''
         print 'LONGSTRING static const char enum_string_table[] = '
         for enum, name in enum_table:
             print '   "%s\\0"' % (name)
diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h
index 89fb1dceb..8084e5757 100755
--- a/mesalib/src/mapi/glapi/glapi.h
+++ b/mesalib/src/mapi/glapi/glapi.h
@@ -76,6 +76,8 @@ struct _glapi_table;
 
 typedef void (*_glapi_proc)(void); /* generic function pointer */
 
+typedef void (*_glapi_nop_handler_proc)(const char *name);
+
 typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
 
 
@@ -179,6 +181,14 @@ extern struct _glapi_table *
 _glapi_create_table_from_handle(void *handle, const char *symbol_prefix);
 
 
+void
+_glapi_set_nop_handler(_glapi_nop_handler_proc func);
+
+/** Return pointer to new dispatch table filled with no-op functions */
+struct _glapi_table *
+_glapi_new_nop_table(unsigned num_entries);
+
+
 
 #ifdef __cplusplus
 }
diff --git a/mesalib/src/mapi/glapi/glapi_getproc.c b/mesalib/src/mapi/glapi/glapi_getproc.c
index d52b26450..7f4dc7f4d 100644
--- a/mesalib/src/mapi/glapi/glapi_getproc.c
+++ b/mesalib/src/mapi/glapi/glapi_getproc.c
@@ -30,6 +30,9 @@
  */
 
 
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
 #include "glapi/glapi_priv.h"
 #include "glapi/glapitable.h"
 
@@ -37,6 +40,7 @@
 #define FIRST_DYNAMIC_OFFSET (sizeof(struct _glapi_table) / sizeof(void *))
 
 
+
 /**********************************************************************
  * Static function management.
  */
diff --git a/mesalib/src/mapi/glapi/glapi_nop.c b/mesalib/src/mapi/glapi/glapi_nop.c
index cbfbd2433..e006e0259 100644..100755
--- a/mesalib/src/mapi/glapi/glapi_nop.c
+++ b/mesalib/src/mapi/glapi/glapi_nop.c
@@ -30,14 +30,22 @@
  * This file defines a special dispatch table which is loaded with no-op
  * functions.
  *
- * When there's no current rendering context, calling a GL function like
- * glBegin() is a no-op.  Apps should never normally do this.  So as a
- * debugging aid, each of the no-op functions will emit a warning to
- * stderr if the MESA_DEBUG or LIBGL_DEBUG env var is set.
+ * Mesa can register a "no-op handler function" which will be called in
+ * the event that a no-op function is called.
+ *
+ * In the past, the dispatch table was loaded with pointers to a single
+ * no-op function.  But that broke on Windows because the GL entrypoints
+ * use __stdcall convention.  __stdcall means the callee cleans up the
+ * stack.  So one no-op function can't properly clean up the stack.  This
+ * would lead to crashes.
+ *
+ * Another benefit of unique no-op functions is we can accurately report
+ * the function's name in an error message.
  */
 
 
-
+#include <stdlib.h>
+#include <string.h>
 #include "glapi/glapi_priv.h"
 
 #undef _GLAPI_EXPORT
@@ -53,25 +61,32 @@ _glapi_set_warning_func(_glapi_proc func)
 {
 }
 
-/*
- * When GLAPIENTRY is __stdcall (i.e. Windows), the stack is popped by the
- * callee making the number/type of arguments significant.
+
+/**
+ * We'll jump though this function pointer whenever a no-op function
+ * is called.
+ */
+static _glapi_nop_handler_proc nop_handler = NULL;
+
+
+/**
+ * Register the no-op handler call-back function.
  */
-#if defined(_WIN32) || defined(DEBUG)
+_GLAPI_EXPORT void
+_glapi_set_nop_handler(_glapi_nop_handler_proc func)
+{
+   nop_handler = func;
+}
+
 
 /**
  * Called by each of the no-op GL entrypoints.
  */
-static int
-Warn(const char *func)
+static void
+nop(const char *func)
 {
-#if defined(DEBUG)
-   if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG")) {
-      fprintf(stderr, "GL User Error: gl%s called without a rendering context\n",
-              func);
-   }
-#endif
-   return 0;
+   if (nop_handler)
+      nop_handler(func);
 }
 
 
@@ -81,7 +96,8 @@ Warn(const char *func)
 static GLint
 NoOpUnused(void)
 {
-   return Warn(" function");
+   nop("unused GL entry point");
+   return 0;
 }
 
 /*
@@ -91,31 +107,28 @@ NoOpUnused(void)
 #define KEYWORD1_ALT static
 #define KEYWORD2 GLAPIENTRY
 #define NAME(func)  NoOp##func
-#define DISPATCH(func, args, msg)  Warn(#func);
-#define RETURN_DISPATCH(func, args, msg)  Warn(#func); return 0
+#define DISPATCH(func, args, msg)  nop(#func);
+#define RETURN_DISPATCH(func, args, msg)  nop(#func); return 0
 
 
 /*
  * Defines for the table of no-op entry points.
  */
 #define TABLE_ENTRY(name) (_glapi_proc) NoOp##name
+#define DISPATCH_TABLE_NAME __glapi_noop_table
+#define UNUSED_TABLE_NAME __unused_noop_functions
+
+#include "glapi/gen/glapitemp.h"
 
-#else
 
-static int
-NoOpGeneric(void)
+/** Return pointer to new dispatch table filled with no-op functions */
+struct _glapi_table * _GLAPI_EXPORT
+_glapi_new_nop_table(unsigned num_entries)
 {
-   if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG")) {
-      fprintf(stderr, "GL User Error: calling GL function without a rendering context\n");
+   struct _glapi_table *table = malloc(num_entries * sizeof(_glapi_proc));
+   if (table) {
+      memcpy(table, __glapi_noop_table,
+             num_entries * sizeof(_glapi_proc));
    }
-   return 0;
+   return table;
 }
-
-#define TABLE_ENTRY(name) (_glapi_proc) NoOpGeneric
-
-#endif
-
-#define DISPATCH_TABLE_NAME __glapi_noop_table
-#define UNUSED_TABLE_NAME __unused_noop_functions
-
-#include "glapi/gen/glapitemp.h"
diff --git a/mesalib/src/mapi/glapi/glapi_priv.h b/mesalib/src/mapi/glapi/glapi_priv.h
index 0a998b475..cb4cb5b97 100644
--- a/mesalib/src/mapi/glapi/glapi_priv.h
+++ b/mesalib/src/mapi/glapi/glapi_priv.h
@@ -26,9 +26,6 @@
 #ifndef _GLAPI_PRIV_H
 #define _GLAPI_PRIV_H
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/mesalib/src/mapi/mapi_glapi.c b/mesalib/src/mapi/mapi_glapi.c
index 127dfafac..70605f3df 100644
--- a/mesalib/src/mapi/mapi_glapi.c
+++ b/mesalib/src/mapi/mapi_glapi.c
@@ -27,6 +27,7 @@
  */
 
 #include <string.h>
+#include <stdlib.h>
 #include "glapi/glapi.h"
 #include "u_current.h"
 #include "table.h" /* for MAPI_TABLE_NUM_SLOTS */
@@ -222,6 +223,28 @@ _glapi_get_proc_name(unsigned int offset)
    return stub ? stub_get_name(stub) : NULL;
 }
 
+/** Return pointer to new dispatch table filled with no-op functions */
+struct _glapi_table *
+_glapi_new_nop_table(unsigned num_entries)
+{
+   struct _glapi_table *table;
+
+   if (num_entries > MAPI_TABLE_NUM_SLOTS)
+      num_entries = MAPI_TABLE_NUM_SLOTS;
+
+   table = malloc(num_entries * sizeof(mapi_func));
+   if (table) {
+      memcpy(table, table_noop_array, num_entries * sizeof(mapi_func));
+   }
+   return table;
+}
+
+void
+_glapi_set_nop_handler(_glapi_nop_handler_proc func)
+{
+   table_set_noop_handler(func);
+}
+
 /**
  * This is a deprecated function which should not be used anymore.
  * It's only present to satisfy linking with older versions of libGL.
diff --git a/mesalib/src/mapi/table.c b/mesalib/src/mapi/table.c
index 0d2866618..748750197 100644
--- a/mesalib/src/mapi/table.c
+++ b/mesalib/src/mapi/table.c
@@ -30,16 +30,29 @@
 
 #include "table.h"
 
+static nop_handler_proc nop_handler = NULL;
+
+void
+table_set_noop_handler(nop_handler_proc func)
+{
+   nop_handler = func;
+}
+
 static void
 noop_warn(const char *name)
 {
-   static int debug = -1;
+   if (nop_handler) {
+      nop_handler(name);
+   }
+   else {
+      static int debug = -1;
    
-   if (debug < 0)
-      debug = (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"));
+      if (debug < 0)
+         debug = (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"));
 
-   if (debug)
-      fprintf(stderr, "%s is no-op\n", name);
+      if (debug)
+         fprintf(stderr, "%s is no-op\n", name);
+   }
 }
 
 static int
diff --git a/mesalib/src/mapi/table.h b/mesalib/src/mapi/table.h
index e2d6ef03d..a1af40c6f 100644
--- a/mesalib/src/mapi/table.h
+++ b/mesalib/src/mapi/table.h
@@ -41,6 +41,14 @@ struct mapi_table;
 
 extern const mapi_func table_noop_array[];
 
+
+typedef void (*nop_handler_proc)(const char *name);
+
+
+void
+table_set_noop_handler(nop_handler_proc func);
+
+
 /**
  * Get the no-op dispatch table.
  */
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index 81939f981..a563fd2ff 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -39,18 +39,13 @@ else:
 # parse Makefile.sources
 source_lists = env.ParseSourceList('Makefile.sources')
 
-env.Append(YACCFLAGS = '-d -p "_mesa_program_"')
-program_lex = env.CFile('program/lex.yy.c', 'program/program_lexer.l')
-program_parse = env.CFile('program/program_parse.tab.c',
-                          'program/program_parse.y')
-program_sources = source_lists['PROGRAM_FILES'] + [
-    program_lex,
-    program_parse[0],
-]
+env.Append(YACCFLAGS = ['-d', '-p', '_mesa_program_'])
+env.CFile('program/lex.yy.c', 'program/program_lexer.l')
+env.CFile('program/program_parse.tab.c', 'program/program_parse.y')
 
 mesa_sources = (
     source_lists['MESA_FILES'] +
-    program_sources +
+    source_lists['PROGRAM_FILES'] +
     source_lists['STATETRACKER_FILES']
 )
 
@@ -135,7 +130,9 @@ def write_git_sha1_h_file(filename):
         (commit, foo) = subprocess.Popen(args, stdout=subprocess.PIPE).communicate()
     except:
         # git log command didn't work
-        if not os.path.exists(filename):
+        dirname = os.path.dirname(filename)
+        if not os.path.exists(dirname):
+            os.makedirs(dirname)
             # create an empty file if none already exists
             f = open(filename, "w")
             f.close()
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index fdc4cf1e9..cf99d9563 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -247,9 +247,9 @@ _mesa_meta_setup_blit_shader(struct gl_context *ctx,
                              struct blit_shader_table *table)
 {
    char *vs_source, *fs_source;
-   void *const mem_ctx = ralloc_context(NULL);
    struct blit_shader *shader = choose_blit_shader(target, table);
    const char *vs_input, *vs_output, *fs_input, *vs_preprocess, *fs_preprocess;
+   void *mem_ctx;
 
    if (ctx->Const.GLSLVersion < 130) {
       vs_preprocess = "";
@@ -273,6 +273,8 @@ _mesa_meta_setup_blit_shader(struct gl_context *ctx,
       return;
    }
 
+   mem_ctx = ralloc_context(NULL);
+
    vs_source = ralloc_asprintf(mem_ctx,
                 "%s\n"
                 "%s vec2 position;\n"
diff --git a/mesalib/src/mesa/drivers/common/meta_tex_subimage.c b/mesalib/src/mesa/drivers/common/meta_tex_subimage.c
index e29addb73..ad6e7873e 100644
--- a/mesalib/src/mesa/drivers/common/meta_tex_subimage.c
+++ b/mesalib/src/mesa/drivers/common/meta_tex_subimage.c
@@ -150,9 +150,6 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims,
    bool success = false;
    int z;
 
-   /* XXX: This should probably be passed in from somewhere */
-   const char *where = "_mesa_meta_pbo_TexSubImage";
-
    if (!_mesa_is_bufferobj(packing->BufferObj) && !create_pbo)
       return false;
 
@@ -165,19 +162,6 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims,
    if (ctx->_ImageTransferState)
       return false;
 
-   if (!_mesa_validate_pbo_access(dims, packing, width, height, depth,
-                                  format, type, INT_MAX, pixels)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "%s(out of bounds PBO access)", where);
-      return true;
-   }
-
-   if (_mesa_check_disallowed_mapping(packing->BufferObj)) {
-      /* buffer is mapped - that's an error */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
-      return true;
-   }
-
    /* For arrays, use a tall (height * depth) 2D texture but taking into
     * account the inter-image padding specified with the image height packing
     * property.
@@ -277,9 +261,6 @@ _mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx, GLuint dims,
    bool success = false;
    int z;
 
-   /* XXX: This should probably be passed in from somewhere */
-   const char *where = "_mesa_meta_pbo_GetTexSubImage";
-
    if (!_mesa_is_bufferobj(packing->BufferObj))
       return false;
 
@@ -292,19 +273,6 @@ _mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx, GLuint dims,
    if (ctx->_ImageTransferState)
       return false;
 
-   if (!_mesa_validate_pbo_access(dims, packing, width, height, depth,
-                                  format, type, INT_MAX, pixels)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "%s(out of bounds PBO access)", where);
-      return true;
-   }
-
-   if (_mesa_check_disallowed_mapping(packing->BufferObj)) {
-      /* buffer is mapped - that's an error */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
-      return true;
-   }
-
    /* For arrays, use a tall (height * depth) 2D texture but taking into
     * account the inter-image padding specified with the image height packing
     * property.
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_test.c b/mesalib/src/mesa/drivers/dri/common/dri_test.c
index 7ab50d923..57bfa5b93 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_test.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_test.c
@@ -76,6 +76,17 @@ _glapi_get_dispatch_table_size(void)
 	return 0;
 }
 
+PUBLIC void
+_glapi_set_nop_handler(_glapi_nop_handler_proc func)
+{
+}
+
+PUBLIC struct _glapi_table *
+_glapi_new_nop_table(unsigned num_entries)
+{
+	return NULL;
+}
+
 #ifndef NO_MAIN
 int main(int argc, char** argv)
 {
diff --git a/mesalib/src/mesa/main/api_exec.h b/mesalib/src/mesa/main/api_exec.h
index 1e4a9d61a..12249fec2 100644
--- a/mesalib/src/mesa/main/api_exec.h
+++ b/mesalib/src/mesa/main/api_exec.h
@@ -30,12 +30,8 @@
 extern "C" {
 #endif
 
-struct _glapi_table;
 struct gl_context;
 
-extern struct _glapi_table *
-_mesa_alloc_dispatch_table(void);
-
 extern void
 _mesa_initialize_exec_table(struct gl_context *ctx);
 
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index 008d1aa5f..25110c33b 100755
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -232,67 +232,62 @@ bufferobj_range_mapped(const struct gl_buffer_object *obj,
  * \c glClearBufferSubData.
  *
  * \param ctx     GL context.
- * \param target  Buffer object target on which to operate.
+ * \param bufObj  The buffer object.
  * \param offset  Offset of the first byte of the subdata range.
  * \param size    Size, in bytes, of the subdata range.
  * \param mappedRange  If true, checks if an overlapping range is mapped.
  *                     If false, checks if buffer is mapped.
- * \param errorNoBuffer  Error code if no buffer is bound to target.
  * \param caller  Name of calling function for recording errors.
- * \return   A pointer to the buffer object bound to \c target in the
- *           specified context or \c NULL if any of the parameter or state
- *           conditions are invalid.
+ * \return   false if error, true otherwise
  *
  * \sa glBufferSubDataARB, glGetBufferSubDataARB, glClearBufferSubData
  */
-static struct gl_buffer_object *
-buffer_object_subdata_range_good(struct gl_context * ctx, GLenum target,
-                                 GLintptrARB offset, GLsizeiptrARB size,
-                                 bool mappedRange, GLenum errorNoBuffer,
-                                 const char *caller)
+static bool
+buffer_object_subdata_range_good(struct gl_context *ctx,
+                                 struct gl_buffer_object *bufObj,
+                                 GLintptr offset, GLsizeiptr size,
+                                 bool mappedRange, const char *caller)
 {
-   struct gl_buffer_object *bufObj;
-
    if (size < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE, "%s(size < 0)", caller);
-      return NULL;
+      return false;
    }
 
    if (offset < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE, "%s(offset < 0)", caller);
-      return NULL;
+      return false;
    }
 
-   bufObj = get_buffer(ctx, caller, target, errorNoBuffer);
-   if (!bufObj)
-      return NULL;
-
    if (offset + size > bufObj->Size) {
       _mesa_error(ctx, GL_INVALID_VALUE,
                   "%s(offset %lu + size %lu > buffer size %lu)", caller,
                   (unsigned long) offset,
                   (unsigned long) size,
                   (unsigned long) bufObj->Size);
-      return NULL;
+      return false;
    }
 
    if (bufObj->Mappings[MAP_USER].AccessFlags & GL_MAP_PERSISTENT_BIT)
-      return bufObj;
+      return true;
 
    if (mappedRange) {
       if (bufferobj_range_mapped(bufObj, offset, size)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
-         return NULL;
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "%s(range is mapped without persistent bit)",
+                     caller);
+         return false;
       }
    }
    else {
       if (_mesa_bufferobj_mapped(bufObj, MAP_USER)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
-         return NULL;
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "%s(buffer is mapped without persistent bit)",
+                     caller);
+         return false;
       }
    }
 
-   return bufObj;
+   return true;
 }
 
 
@@ -561,9 +556,9 @@ _mesa_total_buffer_object_memory(struct gl_context *ctx)
  * \sa glBufferDataARB, dd_function_table::BufferData.
  */
 GLboolean
-_mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,
-		   const GLvoid * data, GLenum usage, GLenum storageFlags,
-		   struct gl_buffer_object * bufObj )
+buffer_data_fallback(struct gl_context *ctx, GLenum target, GLsizeiptr size,
+                     const GLvoid *data, GLenum usage, GLenum storageFlags,
+                     struct gl_buffer_object *bufObj)
 {
    void * new_data;
 
@@ -607,9 +602,9 @@ _mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,
  * \sa glBufferSubDataARB, dd_function_table::BufferSubData.
  */
 void
-_mesa_buffer_subdata( struct gl_context *ctx, GLintptrARB offset,
-		      GLsizeiptrARB size, const GLvoid * data,
-		      struct gl_buffer_object * bufObj )
+buffer_sub_data_fallback(struct gl_context *ctx, GLintptr offset,
+                         GLsizeiptr size, const GLvoid *data,
+                         struct gl_buffer_object *bufObj)
 {
    (void) ctx;
 
@@ -670,11 +665,11 @@ _mesa_buffer_get_subdata( struct gl_context *ctx, GLintptrARB offset,
  * dd_function_table::ClearBufferSubData.
  */
 void
-_mesa_buffer_clear_subdata(struct gl_context *ctx,
-                           GLintptr offset, GLsizeiptr size,
-                           const GLvoid *clearValue,
-                           GLsizeiptr clearValueSize,
-                           struct gl_buffer_object *bufObj)
+_mesa_ClearBufferSubData_sw(struct gl_context *ctx,
+                            GLintptr offset, GLsizeiptr size,
+                            const GLvoid *clearValue,
+                            GLsizeiptr clearValueSize,
+                            struct gl_buffer_object *bufObj)
 {
    GLsizeiptr i;
    GLubyte *dest;
@@ -711,10 +706,10 @@ _mesa_buffer_clear_subdata(struct gl_context *ctx,
  * Called via glMapBufferRange().
  */
 static void *
-_mesa_buffer_map_range( struct gl_context *ctx, GLintptr offset,
-                        GLsizeiptr length, GLbitfield access,
-                        struct gl_buffer_object *bufObj,
-                        gl_map_buffer_index index)
+map_buffer_range_fallback(struct gl_context *ctx, GLintptr offset,
+                          GLsizeiptr length, GLbitfield access,
+                          struct gl_buffer_object *bufObj,
+                          gl_map_buffer_index index)
 {
    (void) ctx;
    assert(!_mesa_bufferobj_mapped(bufObj, index));
@@ -732,10 +727,10 @@ _mesa_buffer_map_range( struct gl_context *ctx, GLintptr offset,
  * Called via glFlushMappedBufferRange().
  */
 static void
-_mesa_buffer_flush_mapped_range( struct gl_context *ctx,
-                                 GLintptr offset, GLsizeiptr length,
-                                 struct gl_buffer_object *obj,
-                                 gl_map_buffer_index index)
+flush_mapped_buffer_range_fallback(struct gl_context *ctx,
+                                   GLintptr offset, GLsizeiptr length,
+                                   struct gl_buffer_object *obj,
+                                   gl_map_buffer_index index)
 {
    (void) ctx;
    (void) offset;
@@ -746,15 +741,15 @@ _mesa_buffer_flush_mapped_range( struct gl_context *ctx,
 
 
 /**
- * Default callback for \c dd_function_table::MapBuffer().
+ * Default callback for \c dd_function_table::UnmapBuffer().
  *
  * The input parameters will have been already tested for errors.
  *
  * \sa glUnmapBufferARB, dd_function_table::UnmapBuffer
  */
 GLboolean
-_mesa_buffer_unmap(struct gl_context *ctx, struct gl_buffer_object *bufObj,
-                   gl_map_buffer_index index)
+unmap_buffer_fallback(struct gl_context *ctx, struct gl_buffer_object *bufObj,
+                      gl_map_buffer_index index)
 {
    (void) ctx;
    /* XXX we might assert here that bufObj->Pointer is non-null */
@@ -771,11 +766,11 @@ _mesa_buffer_unmap(struct gl_context *ctx, struct gl_buffer_object *bufObj,
  * Called via glCopyBufferSubData().
  */
 static void
-_mesa_copy_buffer_subdata(struct gl_context *ctx,
-                          struct gl_buffer_object *src,
-                          struct gl_buffer_object *dst,
-                          GLintptr readOffset, GLintptr writeOffset,
-                          GLsizeiptr size)
+copy_buffer_sub_data_fallback(struct gl_context *ctx,
+                              struct gl_buffer_object *src,
+                              struct gl_buffer_object *dst,
+                              GLintptr readOffset, GLintptr writeOffset,
+                              GLsizeiptr size)
 {
    GLubyte *srcPtr, *dstPtr;
 
@@ -1006,6 +1001,27 @@ _mesa_lookup_bufferobj_locked(struct gl_context *ctx, GLuint buffer)
       _mesa_HashLookupLocked(ctx->Shared->BufferObjects, buffer);
 }
 
+/**
+ * A convenience function for direct state access functions that throws
+ * GL_INVALID_OPERATION if buffer is not the name of an existing
+ * buffer object.
+ */
+struct gl_buffer_object *
+_mesa_lookup_bufferobj_err(struct gl_context *ctx, GLuint buffer,
+                           const char *caller)
+{
+   struct gl_buffer_object *bufObj;
+
+   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
+   if (!bufObj || bufObj == &DummyBufferObject) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "%s(non-existent buffer object %u)", caller, buffer);
+      return NULL;
+   }
+
+   return bufObj;
+}
+
 
 void
 _mesa_begin_bufferobj_lookups(struct gl_context *ctx)
@@ -1098,20 +1114,20 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver)
    /* GL_ARB_vertex/pixel_buffer_object */
    driver->NewBufferObject = _mesa_new_buffer_object;
    driver->DeleteBuffer = _mesa_delete_buffer_object;
-   driver->BufferData = _mesa_buffer_data;
-   driver->BufferSubData = _mesa_buffer_subdata;
+   driver->BufferData = buffer_data_fallback;
+   driver->BufferSubData = buffer_sub_data_fallback;
    driver->GetBufferSubData = _mesa_buffer_get_subdata;
-   driver->UnmapBuffer = _mesa_buffer_unmap;
+   driver->UnmapBuffer = unmap_buffer_fallback;
 
    /* GL_ARB_clear_buffer_object */
-   driver->ClearBufferSubData = _mesa_buffer_clear_subdata;
+   driver->ClearBufferSubData = _mesa_ClearBufferSubData_sw;
 
    /* GL_ARB_map_buffer_range */
-   driver->MapBufferRange = _mesa_buffer_map_range;
-   driver->FlushMappedBufferRange = _mesa_buffer_flush_mapped_range;
+   driver->MapBufferRange = map_buffer_range_fallback;
+   driver->FlushMappedBufferRange = flush_mapped_buffer_range_fallback;
 
    /* GL_ARB_copy_buffer */
-   driver->CopyBufferSubData = _mesa_copy_buffer_subdata;
+   driver->CopyBufferSubData = copy_buffer_sub_data_fallback;
 }
 
 
@@ -1273,27 +1289,29 @@ _mesa_DeleteBuffers(GLsizei n, const GLuint *ids)
 
 
 /**
- * Generate a set of unique buffer object IDs and store them in \c buffer.
- * 
- * \param n       Number of IDs to generate.
- * \param buffer  Array of \c n locations to store the IDs.
+ * This is the implementation for glGenBuffers and glCreateBuffers. It is not
+ * exposed to the rest of Mesa to encourage the use of nameless buffers in
+ * driver internals.
  */
-void GLAPIENTRY
-_mesa_GenBuffers(GLsizei n, GLuint *buffer)
+static void
+create_buffers(GLsizei n, GLuint *buffers, bool dsa)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint first;
    GLint i;
+   struct gl_buffer_object *buf;
+
+   const char *func = dsa ? "glCreateBuffers" : "glGenBuffers";
 
    if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glGenBuffers(%d)\n", n);
+      _mesa_debug(ctx, "%s(%d)\n", func, n);
 
    if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenBuffersARB");
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(n %d < 0)", func, n);
       return;
    }
 
-   if (!buffer) {
+   if (!buffers) {
       return;
    }
 
@@ -1304,16 +1322,53 @@ _mesa_GenBuffers(GLsizei n, GLuint *buffer)
 
    first = _mesa_HashFindFreeKeyBlock(ctx->Shared->BufferObjects, n);
 
-   /* Insert the ID and pointer to dummy buffer object into hash table */
+   /* Insert the ID and pointer into the hash table. If non-DSA, insert a
+    * DummyBufferObject.  Otherwise, create a new buffer object and insert
+    * it.
+    */
    for (i = 0; i < n; i++) {
-      _mesa_HashInsert(ctx->Shared->BufferObjects, first + i,
-                       &DummyBufferObject);
-      buffer[i] = first + i;
+      buffers[i] = first + i;
+      if (dsa) {
+         assert(ctx->Driver.NewBufferObject);
+         buf = ctx->Driver.NewBufferObject(ctx, buffers[i]);
+         if (!buf) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", func);
+            return;
+         }
+      }
+      else
+         buf = &DummyBufferObject;
+
+      _mesa_HashInsert(ctx->Shared->BufferObjects, buffers[i], buf);
    }
 
    mtx_unlock(&ctx->Shared->Mutex);
 }
 
+/**
+ * Generate a set of unique buffer object IDs and store them in \c buffers.
+ *
+ * \param n        Number of IDs to generate.
+ * \param buffers  Array of \c n locations to store the IDs.
+ */
+void GLAPIENTRY
+_mesa_GenBuffers(GLsizei n, GLuint *buffers)
+{
+   create_buffers(n, buffers, false);
+}
+
+/**
+ * Create a set of buffer objects and store their unique IDs in \c buffers.
+ *
+ * \param n        Number of IDs to generate.
+ * \param buffers  Array of \c n locations to store the IDs.
+ */
+void GLAPIENTRY
+_mesa_CreateBuffers(GLsizei n, GLuint *buffers)
+{
+   create_buffers(n, buffers, true);
+}
+
 
 /**
  * Determine if ID is the name of a buffer object.
@@ -1337,15 +1392,13 @@ _mesa_IsBuffer(GLuint id)
 }
 
 
-void GLAPIENTRY
-_mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
-                    GLbitfield flags)
+void
+_mesa_buffer_storage(struct gl_context *ctx, struct gl_buffer_object *bufObj,
+                     GLenum target, GLsizeiptr size, const GLvoid *data,
+                     GLbitfield flags, const char *func)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *bufObj;
-
    if (size <= 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBufferStorage(size <= 0)");
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(size <= 0)", func);
       return;
    }
 
@@ -1355,27 +1408,25 @@ _mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
                  GL_MAP_COHERENT_BIT |
                  GL_DYNAMIC_STORAGE_BIT |
                  GL_CLIENT_STORAGE_BIT)) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBufferStorage(flags)");
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(invalid flag bits set)", func);
       return;
    }
 
    if (flags & GL_MAP_PERSISTENT_BIT &&
        !(flags & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT))) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBufferStorage(flags!=READ/WRITE)");
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "%s(PERSISTENT and flags!=READ/WRITE)", func);
       return;
    }
 
    if (flags & GL_MAP_COHERENT_BIT && !(flags & GL_MAP_PERSISTENT_BIT)) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBufferStorage(flags!=PERSISTENT)");
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "%s(COHERENT and flags!=PERSISTENT)", func);
       return;
    }
 
-   bufObj = get_buffer(ctx, "glBufferStorage", target, GL_INVALID_OPERATION);
-   if (!bufObj)
-      return;
-
    if (bufObj->Immutable) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferStorage(immutable)");
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(immutable)", func);
       return;
    }
 
@@ -1395,31 +1446,65 @@ _mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
           * glBufferStorage is not described in the spec, Graham Sellers
           * said that it should behave the same as glBufferData.
           */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferStorage()");
+         _mesa_error(ctx, GL_INVALID_OPERATION, "%s", func);
       }
       else {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBufferStorage()");
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", func);
       }
    }
 }
 
+void GLAPIENTRY
+_mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
+                    GLbitfield flags)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+
+   bufObj = get_buffer(ctx, "glBufferStorage", target, GL_INVALID_OPERATION);
+   if (!bufObj)
+      return;
+
+   _mesa_buffer_storage(ctx, bufObj, target, size, data, flags,
+                        "glBufferStorage");
+}
 
 void GLAPIENTRY
-_mesa_BufferData(GLenum target, GLsizeiptrARB size,
-                    const GLvoid * data, GLenum usage)
+_mesa_NamedBufferStorage(GLuint buffer, GLsizeiptr size, const GLvoid *data,
+                         GLbitfield flags)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *bufObj;
+
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glNamedBufferStorage");
+   if (!bufObj)
+      return;
+
+   /*
+    * In direct state access, buffer objects have an unspecified target since
+    * they are not required to be bound.
+    */
+   _mesa_buffer_storage(ctx, bufObj, GL_NONE, size, data, flags,
+                        "glNamedBufferStorage");
+}
+
+
+void
+_mesa_buffer_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
+                  GLenum target, GLsizeiptr size, const GLvoid *data,
+                  GLenum usage, const char *func)
+{
    bool valid_usage;
 
    if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glBufferData(%s, %ld, %p, %s)\n",
+      _mesa_debug(ctx, "%s(%s, %ld, %p, %s)\n",
+                  func,
                   _mesa_lookup_enum_by_nr(target),
                   (long int) size, data,
                   _mesa_lookup_enum_by_nr(usage));
 
    if (size < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBufferDataARB(size < 0)");
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(size < 0)", func);
       return;
    }
 
@@ -1448,16 +1533,13 @@ _mesa_BufferData(GLenum target, GLsizeiptrARB size,
    }
 
    if (!valid_usage) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBufferData(usage)");
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid usage: %s)", func,
+                  _mesa_lookup_enum_by_nr(usage));
       return;
    }
 
-   bufObj = get_buffer(ctx, "glBufferDataARB", target, GL_INVALID_OPERATION);
-   if (!bufObj)
-      return;
-
    if (bufObj->Immutable) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferData(immutable)");
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(immutable)", func);
       return;
    }
 
@@ -1490,33 +1572,73 @@ _mesa_BufferData(GLenum target, GLsizeiptrARB size,
           *   EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD, and the store cannot be
           *   mapped to the GPU address space.
           */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferData()");
+         _mesa_error(ctx, GL_INVALID_OPERATION, "%s", func);
       }
       else {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBufferData()");
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", func);
       }
    }
 }
 
+void GLAPIENTRY
+_mesa_BufferData(GLenum target, GLsizeiptr size,
+                 const GLvoid *data, GLenum usage)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+
+   bufObj = get_buffer(ctx, "glBufferData", target, GL_INVALID_OPERATION);
+   if (!bufObj)
+      return;
+
+   _mesa_buffer_data(ctx, bufObj, target, size, data, usage,
+                     "glBufferData");
+}
 
 void GLAPIENTRY
-_mesa_BufferSubData(GLenum target, GLintptrARB offset,
-                       GLsizeiptrARB size, const GLvoid * data)
+_mesa_NamedBufferData(GLuint buffer, GLsizeiptr size, const GLvoid *data,
+                      GLenum usage)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *bufObj;
 
-   bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,
-                                              false, GL_INVALID_OPERATION,
-                                              "glBufferSubDataARB" );
-   if (!bufObj) {
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glNamedBufferData");
+   if (!bufObj)
+      return;
+
+   /* In direct state access, buffer objects have an unspecified target since
+    * they are not required to be bound.
+    */
+   _mesa_buffer_data(ctx, bufObj, GL_NONE, size, data, usage,
+                     "glNamedBufferData");
+}
+
+
+/**
+ * Implementation for glBufferSubData and glNamedBufferSubData.
+ *
+ * \param ctx     GL context.
+ * \param bufObj  The buffer object.
+ * \param offset  Offset of the first byte of the subdata range.
+ * \param size    Size, in bytes, of the subdata range.
+ * \param data    The data store.
+ * \param func  Name of calling function for recording errors.
+ *
+ */
+void
+_mesa_buffer_sub_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
+                      GLintptr offset, GLsizeiptr size, const GLvoid *data,
+                      const char *func)
+{
+   if (!buffer_object_subdata_range_good(ctx, bufObj, offset, size,
+                                         false, func)) {
       /* error already recorded */
       return;
    }
 
    if (bufObj->Immutable &&
        !(bufObj->StorageFlags & GL_DYNAMIC_STORAGE_BIT)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferSubData");
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", func);
       return;
    }
 
@@ -1526,105 +1648,107 @@ _mesa_BufferSubData(GLenum target, GLintptrARB offset,
    bufObj->Written = GL_TRUE;
 
    assert(ctx->Driver.BufferSubData);
-   ctx->Driver.BufferSubData( ctx, offset, size, data, bufObj );
+   ctx->Driver.BufferSubData(ctx, offset, size, data, bufObj);
 }
 
+void GLAPIENTRY
+_mesa_BufferSubData(GLenum target, GLintptr offset,
+                    GLsizeiptr size, const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+
+   bufObj = get_buffer(ctx, "glBufferSubData", target, GL_INVALID_OPERATION);
+   if (!bufObj)
+      return;
+
+   _mesa_buffer_sub_data(ctx, bufObj, offset, size, data, "glBufferSubData");
+}
 
 void GLAPIENTRY
-_mesa_GetBufferSubData(GLenum target, GLintptrARB offset,
-                          GLsizeiptrARB size, void * data)
+_mesa_NamedBufferSubData(GLuint buffer, GLintptr offset,
+                         GLsizeiptr size, const GLvoid *data)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *bufObj;
 
-   bufObj = buffer_object_subdata_range_good(ctx, target, offset, size,
-                                             false, GL_INVALID_OPERATION,
-                                             "glGetBufferSubDataARB");
-   if (!bufObj) {
-      /* error already recorded */
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glNamedBufferSubData");
+   if (!bufObj)
       return;
-   }
 
-   assert(ctx->Driver.GetBufferSubData);
-   ctx->Driver.GetBufferSubData( ctx, offset, size, data, bufObj );
+   _mesa_buffer_sub_data(ctx, bufObj, offset, size, data,
+                         "glNamedBufferSubData");
 }
 
 
 void GLAPIENTRY
-_mesa_ClearBufferData(GLenum target, GLenum internalformat, GLenum format,
-                      GLenum type, const GLvoid* data)
+_mesa_GetBufferSubData(GLenum target, GLintptr offset,
+                       GLsizeiptr size, GLvoid *data)
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object* bufObj;
-   mesa_format mesaFormat;
-   GLubyte clearValue[MAX_PIXEL_BYTES];
-   GLsizeiptr clearValueSize;
+   struct gl_buffer_object *bufObj;
 
-   bufObj = get_buffer(ctx, "glClearBufferData", target, GL_INVALID_VALUE);
-   if (!bufObj) {
+   bufObj = get_buffer(ctx, "glGetBufferSubData", target,
+                       GL_INVALID_OPERATION);
+   if (!bufObj)
       return;
-   }
 
-   if (_mesa_check_disallowed_mapping(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glClearBufferData(buffer currently mapped)");
+   if (!buffer_object_subdata_range_good(ctx, bufObj, offset, size, false,
+                                         "glGetBufferSubData")) {
       return;
    }
 
-   mesaFormat = validate_clear_buffer_format(ctx, internalformat,
-                                             format, type,
-                                             "glClearBufferData");
-   if (mesaFormat == MESA_FORMAT_NONE) {
-      return;
-   }
+   assert(ctx->Driver.GetBufferSubData);
+   ctx->Driver.GetBufferSubData(ctx, offset, size, data, bufObj);
+}
 
-   clearValueSize = _mesa_get_format_bytes(mesaFormat);
-   if (bufObj->Size % clearValueSize != 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glClearBufferData(size is not a multiple of "
-                  "internalformat size)");
-      return;
-   }
+void GLAPIENTRY
+_mesa_GetNamedBufferSubData(GLuint buffer, GLintptr offset,
+                            GLsizeiptr size, GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
 
-   if (data == NULL) {
-      /* clear to zeros, per the spec */
-      ctx->Driver.ClearBufferSubData(ctx, 0, bufObj->Size,
-                                     NULL, clearValueSize, bufObj);
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer,
+                                       "glGetNamedBufferSubData");
+   if (!bufObj)
       return;
-   }
 
-   if (!convert_clear_buffer_data(ctx, mesaFormat, clearValue,
-                                  format, type, data, "glClearBufferData")) {
+   if (!buffer_object_subdata_range_good(ctx, bufObj, offset, size, false,
+                                         "glGetNamedBufferSubData")) {
       return;
    }
 
-   ctx->Driver.ClearBufferSubData(ctx, 0, bufObj->Size,
-                                  clearValue, clearValueSize, bufObj);
+   assert(ctx->Driver.GetBufferSubData);
+   ctx->Driver.GetBufferSubData(ctx, offset, size, data, bufObj);
 }
 
 
-void GLAPIENTRY
-_mesa_ClearBufferSubData(GLenum target, GLenum internalformat,
-                         GLintptr offset, GLsizeiptr size,
-                         GLenum format, GLenum type,
-                         const GLvoid* data)
+/**
+ * \param subdata   true if caller is *SubData, false if *Data
+ */
+void
+_mesa_clear_buffer_sub_data(struct gl_context *ctx,
+                            struct gl_buffer_object *bufObj,
+                            GLenum internalformat,
+                            GLintptr offset, GLsizeiptr size,
+                            GLenum format, GLenum type,
+                            const GLvoid *data,
+                            const char *func, bool subdata)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object* bufObj;
    mesa_format mesaFormat;
    GLubyte clearValue[MAX_PIXEL_BYTES];
    GLsizeiptr clearValueSize;
 
-   bufObj = buffer_object_subdata_range_good(ctx, target, offset, size,
-                                             true, GL_INVALID_VALUE,
-                                             "glClearBufferSubData");
-   if (!bufObj) {
+   /* This checks for disallowed mappings. */
+   if (!buffer_object_subdata_range_good(ctx, bufObj, offset, size,
+                                         subdata, func)) {
       return;
    }
 
    mesaFormat = validate_clear_buffer_format(ctx, internalformat,
-                                             format, type,
-                                             "glClearBufferSubData");
+                                             format, type, func);
+
    if (mesaFormat == MESA_FORMAT_NONE) {
       return;
    }
@@ -1632,8 +1756,8 @@ _mesa_ClearBufferSubData(GLenum target, GLenum internalformat,
    clearValueSize = _mesa_get_format_bytes(mesaFormat);
    if (offset % clearValueSize != 0 || size % clearValueSize != 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glClearBufferSubData(offset or size is not a multiple of "
-                  "internalformat size)");
+                  "%s(offset or size is not a multiple of "
+                  "internalformat size)", func);
       return;
    }
 
@@ -1647,8 +1771,7 @@ _mesa_ClearBufferSubData(GLenum target, GLenum internalformat,
    }
 
    if (!convert_clear_buffer_data(ctx, mesaFormat, clearValue,
-                                  format, type, data,
-                                  "glClearBufferSubData")) {
+                                  format, type, data, func)) {
       return;
    }
 
@@ -1658,131 +1781,87 @@ _mesa_ClearBufferSubData(GLenum target, GLenum internalformat,
    }
 }
 
-
-void * GLAPIENTRY
-_mesa_MapBuffer(GLenum target, GLenum access)
+void GLAPIENTRY
+_mesa_ClearBufferData(GLenum target, GLenum internalformat, GLenum format,
+                      GLenum type, const GLvoid *data)
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object * bufObj;
-   GLbitfield accessFlags;
-   void *map;
-   bool valid_access;
+   struct gl_buffer_object *bufObj;
 
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
+   bufObj = get_buffer(ctx, "glClearBufferData", target, GL_INVALID_VALUE);
+   if (!bufObj)
+      return;
 
-   switch (access) {
-   case GL_READ_ONLY_ARB:
-      accessFlags = GL_MAP_READ_BIT;
-      valid_access = _mesa_is_desktop_gl(ctx);
-      break;
-   case GL_WRITE_ONLY_ARB:
-      accessFlags = GL_MAP_WRITE_BIT;
-      valid_access = true;
-      break;
-   case GL_READ_WRITE_ARB:
-      accessFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
-      valid_access = _mesa_is_desktop_gl(ctx);
-      break;
-   default:
-      valid_access = false;
-      break;
-   }
+   _mesa_clear_buffer_sub_data(ctx, bufObj, internalformat, 0, bufObj->Size,
+                               format, type, data,
+                               "glClearBufferData", false);
+}
 
-   if (!valid_access) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)");
-      return NULL;
-   }
+void GLAPIENTRY
+_mesa_ClearNamedBufferData(GLuint buffer, GLenum internalformat,
+                           GLenum format, GLenum type, const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
 
-   bufObj = get_buffer(ctx, "glMapBufferARB", target, GL_INVALID_OPERATION);
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glClearNamedBufferData");
    if (!bufObj)
-      return NULL;
+      return;
 
-   if (accessFlags & GL_MAP_READ_BIT &&
-       !(bufObj->StorageFlags & GL_MAP_READ_BIT)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBuffer(invalid read flag)");
-      return NULL;
-   }
+   _mesa_clear_buffer_sub_data(ctx, bufObj, internalformat, 0, bufObj->Size,
+                               format, type, data,
+                               "glClearNamedBufferData", false);
+}
 
-   if (accessFlags & GL_MAP_WRITE_BIT &&
-       !(bufObj->StorageFlags & GL_MAP_WRITE_BIT)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBuffer(invalid write flag)");
-      return NULL;
-   }
 
-   if (_mesa_bufferobj_mapped(bufObj, MAP_USER)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(already mapped)");
-      return NULL;
-   }
-
-   if (!bufObj->Size) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                  "glMapBuffer(buffer size = 0)");
-      return NULL;
-   }
+void GLAPIENTRY
+_mesa_ClearBufferSubData(GLenum target, GLenum internalformat,
+                         GLintptr offset, GLsizeiptr size,
+                         GLenum format, GLenum type,
+                         const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
 
-   assert(ctx->Driver.MapBufferRange);
-   map = ctx->Driver.MapBufferRange(ctx, 0, bufObj->Size, accessFlags, bufObj,
-                                    MAP_USER);
-   if (!map) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(map failed)");
-      return NULL;
-   }
-   else {
-      /* The driver callback should have set these fields.
-       * This is important because other modules (like VBO) might call
-       * the driver function directly.
-       */
-      assert(bufObj->Mappings[MAP_USER].Pointer == map);
-      assert(bufObj->Mappings[MAP_USER].Length == bufObj->Size);
-      assert(bufObj->Mappings[MAP_USER].Offset == 0);
-      bufObj->Mappings[MAP_USER].AccessFlags = accessFlags;
-   }
+   bufObj = get_buffer(ctx, "glClearBufferSubData", target, GL_INVALID_VALUE);
+   if (!bufObj)
+      return;
 
-   if (access == GL_WRITE_ONLY_ARB || access == GL_READ_WRITE_ARB)
-      bufObj->Written = GL_TRUE;
+   _mesa_clear_buffer_sub_data(ctx, bufObj, internalformat, offset, size,
+                               format, type, data,
+                               "glClearBufferSubData", true);
+}
 
-#ifdef VBO_DEBUG
-   printf("glMapBufferARB(%u, sz %ld, access 0x%x)\n",
-	  bufObj->Name, bufObj->Size, access);
-   if (access == GL_WRITE_ONLY_ARB) {
-      GLuint i;
-      GLubyte *b = (GLubyte *) bufObj->Pointer;
-      for (i = 0; i < bufObj->Size; i++)
-         b[i] = i & 0xff;
-   }
-#endif
+void GLAPIENTRY
+_mesa_ClearNamedBufferSubData(GLuint buffer, GLenum internalformat,
+                              GLintptr offset, GLsizeiptr size,
+                              GLenum format, GLenum type,
+                              const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
 
-#ifdef BOUNDS_CHECK
-   {
-      GLubyte *buf = (GLubyte *) bufObj->Pointer;
-      GLuint i;
-      /* buffer is 100 bytes larger than requested, fill with magic value */
-      for (i = 0; i < 100; i++) {
-         buf[bufObj->Size - i - 1] = 123;
-      }
-   }
-#endif
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer,
+                                       "glClearNamedBufferSubData");
+   if (!bufObj)
+      return;
 
-   return bufObj->Mappings[MAP_USER].Pointer;
+   _mesa_clear_buffer_sub_data(ctx, bufObj, internalformat, offset, size,
+                               format, type, data,
+                               "glClearNamedBufferSubData", true);
 }
 
 
-GLboolean GLAPIENTRY
-_mesa_UnmapBuffer(GLenum target)
+GLboolean
+_mesa_unmap_buffer(struct gl_context *ctx, struct gl_buffer_object *bufObj,
+                   const char *func)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *bufObj;
    GLboolean status = GL_TRUE;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
 
-   bufObj = get_buffer(ctx, "glUnmapBufferARB", target, GL_INVALID_OPERATION);
-   if (!bufObj)
-      return GL_FALSE;
-
    if (!_mesa_bufferobj_mapped(bufObj, MAP_USER)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB");
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "%s(buffer is not mapped)", func);
       return GL_FALSE;
    }
 
@@ -1831,129 +1910,164 @@ _mesa_UnmapBuffer(GLenum target)
    return status;
 }
 
+GLboolean GLAPIENTRY
+_mesa_UnmapBuffer(GLenum target)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
 
-void GLAPIENTRY
-_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
+   bufObj = get_buffer(ctx, "glUnmapBuffer", target, GL_INVALID_OPERATION);
+   if (!bufObj)
+      return GL_FALSE;
+
+   return _mesa_unmap_buffer(ctx, bufObj, "glUnmapBuffer");
+}
+
+GLboolean GLAPIENTRY
+_mesa_UnmapNamedBuffer(GLuint buffer)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *bufObj;
 
-   bufObj = get_buffer(ctx, "glGetBufferParameterivARB", target,
-                       GL_INVALID_OPERATION);
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glUnmapNamedBuffer");
    if (!bufObj)
-      return;
+      return GL_FALSE;
 
+   return _mesa_unmap_buffer(ctx, bufObj, "glUnmapNamedBuffer");
+}
+
+
+static bool
+get_buffer_parameter(struct gl_context *ctx,
+                     struct gl_buffer_object *bufObj, GLenum pname,
+                     GLint64 *params, const char *func)
+{
    switch (pname) {
    case GL_BUFFER_SIZE_ARB:
-      *params = (GLint) bufObj->Size;
-      return;
+      *params = bufObj->Size;
+      break;
    case GL_BUFFER_USAGE_ARB:
       *params = bufObj->Usage;
-      return;
+      break;
    case GL_BUFFER_ACCESS_ARB:
       *params = simplified_access_mode(ctx,
                             bufObj->Mappings[MAP_USER].AccessFlags);
-      return;
+      break;
    case GL_BUFFER_MAPPED_ARB:
       *params = _mesa_bufferobj_mapped(bufObj, MAP_USER);
-      return;
+      break;
    case GL_BUFFER_ACCESS_FLAGS:
       if (!ctx->Extensions.ARB_map_buffer_range)
          goto invalid_pname;
       *params = bufObj->Mappings[MAP_USER].AccessFlags;
-      return;
+      break;
    case GL_BUFFER_MAP_OFFSET:
       if (!ctx->Extensions.ARB_map_buffer_range)
          goto invalid_pname;
-      *params = (GLint) bufObj->Mappings[MAP_USER].Offset;
-      return;
+      *params = bufObj->Mappings[MAP_USER].Offset;
+      break;
    case GL_BUFFER_MAP_LENGTH:
       if (!ctx->Extensions.ARB_map_buffer_range)
          goto invalid_pname;
-      *params = (GLint) bufObj->Mappings[MAP_USER].Length;
-      return;
+      *params = bufObj->Mappings[MAP_USER].Length;
+      break;
    case GL_BUFFER_IMMUTABLE_STORAGE:
       if (!ctx->Extensions.ARB_buffer_storage)
          goto invalid_pname;
       *params = bufObj->Immutable;
-      return;
+      break;
    case GL_BUFFER_STORAGE_FLAGS:
       if (!ctx->Extensions.ARB_buffer_storage)
          goto invalid_pname;
       *params = bufObj->StorageFlags;
-      return;
+      break;
    default:
-      ; /* fall-through */
+      goto invalid_pname;
    }
 
+   return true;
+
 invalid_pname:
-   _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname=%s)",
+   _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid pname: %s)", func,
                _mesa_lookup_enum_by_nr(pname));
+   return false;
 }
 
+void GLAPIENTRY
+_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   GLint64 parameter;
+
+   bufObj = get_buffer(ctx, "glGetBufferParameteriv", target,
+                       GL_INVALID_OPERATION);
+   if (!bufObj)
+      return;
+
+   if (!get_buffer_parameter(ctx, bufObj, pname, &parameter,
+                             "glGetBufferParameteriv"))
+      return; /* Error already recorded. */
+
+   *params = (GLint) parameter;
+}
 
-/**
- * New in GL 3.2
- * This is pretty much a duplicate of GetBufferParameteriv() but the
- * GL_BUFFER_SIZE_ARB attribute will be 64-bits on a 64-bit system.
- */
 void GLAPIENTRY
 _mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *bufObj;
+   GLint64 parameter;
 
    bufObj = get_buffer(ctx, "glGetBufferParameteri64v", target,
                        GL_INVALID_OPERATION);
    if (!bufObj)
       return;
 
-   switch (pname) {
-   case GL_BUFFER_SIZE_ARB:
-      *params = bufObj->Size;
-      return;
-   case GL_BUFFER_USAGE_ARB:
-      *params = bufObj->Usage;
-      return;
-   case GL_BUFFER_ACCESS_ARB:
-      *params = simplified_access_mode(ctx,
-                             bufObj->Mappings[MAP_USER].AccessFlags);
-      return;
-   case GL_BUFFER_ACCESS_FLAGS:
-      if (!ctx->Extensions.ARB_map_buffer_range)
-         goto invalid_pname;
-      *params = bufObj->Mappings[MAP_USER].AccessFlags;
-      return;
-   case GL_BUFFER_MAPPED_ARB:
-      *params = _mesa_bufferobj_mapped(bufObj, MAP_USER);
-      return;
-   case GL_BUFFER_MAP_OFFSET:
-      if (!ctx->Extensions.ARB_map_buffer_range)
-         goto invalid_pname;
-      *params = bufObj->Mappings[MAP_USER].Offset;
-      return;
-   case GL_BUFFER_MAP_LENGTH:
-      if (!ctx->Extensions.ARB_map_buffer_range)
-         goto invalid_pname;
-      *params = bufObj->Mappings[MAP_USER].Length;
-      return;
-   case GL_BUFFER_IMMUTABLE_STORAGE:
-      if (!ctx->Extensions.ARB_buffer_storage)
-         goto invalid_pname;
-      *params = bufObj->Immutable;
+   if (!get_buffer_parameter(ctx, bufObj, pname, &parameter,
+                             "glGetBufferParameteri64v"))
+      return; /* Error already recorded. */
+
+   *params = parameter;
+}
+
+void GLAPIENTRY
+_mesa_GetNamedBufferParameteriv(GLuint buffer, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   GLint64 parameter;
+
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer,
+                                       "glGetNamedBufferParameteriv");
+   if (!bufObj)
       return;
-   case GL_BUFFER_STORAGE_FLAGS:
-      if (!ctx->Extensions.ARB_buffer_storage)
-         goto invalid_pname;
-      *params = bufObj->StorageFlags;
+
+   if (!get_buffer_parameter(ctx, bufObj, pname, &parameter,
+                             "glGetNamedBufferParameteriv"))
+      return; /* Error already recorded. */
+
+   *params = (GLint) parameter;
+}
+
+void GLAPIENTRY
+_mesa_GetNamedBufferParameteri64v(GLuint buffer, GLenum pname,
+                                  GLint64 *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   GLint64 parameter;
+
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer,
+                                       "glGetNamedBufferParameteri64v");
+   if (!bufObj)
       return;
-   default:
-      ; /* fall-through */
-   }
 
-invalid_pname:
-   _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(pname=%s)",
-               _mesa_lookup_enum_by_nr(pname));
+   if (!get_buffer_parameter(ctx, bufObj, pname, &parameter,
+                             "glGetNamedBufferParameteri64v"))
+      return; /* Error already recorded. */
+
+   *params = parameter;
 }
 
 
@@ -1961,14 +2075,15 @@ void GLAPIENTRY
 _mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object * bufObj;
+   struct gl_buffer_object *bufObj;
 
-   if (pname != GL_BUFFER_MAP_POINTER_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointervARB(pname)");
+   if (pname != GL_BUFFER_MAP_POINTER) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointerv(pname != "
+                  "GL_BUFFER_MAP_POINTER)");
       return;
    }
 
-   bufObj = get_buffer(ctx, "glGetBufferPointervARB", target,
+   bufObj = get_buffer(ctx, "glGetBufferPointerv", target,
                        GL_INVALID_OPERATION);
    if (!bufObj)
       return;
@@ -1976,66 +2091,75 @@ _mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params)
    *params = bufObj->Mappings[MAP_USER].Pointer;
 }
 
-
 void GLAPIENTRY
-_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
-                        GLintptr readOffset, GLintptr writeOffset,
-                        GLsizeiptr size)
+_mesa_GetNamedBufferPointerv(GLuint buffer, GLenum pname, GLvoid **params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *src, *dst;
+   struct gl_buffer_object *bufObj;
 
-   src = get_buffer(ctx, "glCopyBufferSubData", readTarget,
-                    GL_INVALID_OPERATION);
-   if (!src)
+   if (pname != GL_BUFFER_MAP_POINTER) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetNamedBufferPointerv(pname != "
+                  "GL_BUFFER_MAP_POINTER)");
       return;
+   }
 
-   dst = get_buffer(ctx, "glCopyBufferSubData", writeTarget,
-                    GL_INVALID_OPERATION);
-   if (!dst)
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer,
+                                       "glGetNamedBufferPointerv");
+   if (!bufObj)
       return;
 
+   *params = bufObj->Mappings[MAP_USER].Pointer;
+}
+
+
+void
+_mesa_copy_buffer_sub_data(struct gl_context *ctx,
+                           struct gl_buffer_object *src,
+                           struct gl_buffer_object *dst,
+                           GLintptr readOffset, GLintptr writeOffset,
+                           GLsizeiptr size, const char *func)
+{
    if (_mesa_check_disallowed_mapping(src)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCopyBufferSubData(readBuffer is mapped)");
+                  "%s(readBuffer is mapped)", func);
       return;
    }
 
    if (_mesa_check_disallowed_mapping(dst)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCopyBufferSubData(writeBuffer is mapped)");
+                  "%s(writeBuffer is mapped)", func);
       return;
    }
 
    if (readOffset < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyBufferSubData(readOffset = %d)", (int) readOffset);
+                  "%s(readOffset %d < 0)", func, (int) readOffset);
       return;
    }
 
    if (writeOffset < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyBufferSubData(writeOffset = %d)", (int) writeOffset);
+                  "%s(writeOffset %d < 0)", func, (int) writeOffset);
       return;
    }
 
    if (size < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyBufferSubData(writeOffset = %d)", (int) size);
+                  "%s(size %d < 0)", func, (int) size);
       return;
    }
 
    if (readOffset + size > src->Size) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyBufferSubData(readOffset + size = %d)",
-                  (int) (readOffset + size));
+                  "%s(readOffset %d + size %d > src_buffer_size %d)", func,
+                  (int) readOffset, (int) size, (int) src->Size);
       return;
    }
 
    if (writeOffset + size > dst->Size) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyBufferSubData(writeOffset + size = %d)",
-                  (int) (writeOffset + size));
+                  "%s(writeOffset %d + size %d > dst_buffer_size %d)", func,
+                  (int) writeOffset, (int) size, (int) dst->Size);
       return;
    }
 
@@ -2049,7 +2173,7 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
       else {
          /* overlapping src/dst is illegal */
          _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyBufferSubData(overlapping src/dst)");
+                     "%s(overlapping src/dst)", func);
          return;
       }
    }
@@ -2057,36 +2181,71 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
    ctx->Driver.CopyBufferSubData(ctx, src, dst, readOffset, writeOffset, size);
 }
 
+void GLAPIENTRY
+_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
+                        GLintptr readOffset, GLintptr writeOffset,
+                        GLsizeiptr size)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *src, *dst;
+
+   src = get_buffer(ctx, "glCopyBufferSubData", readTarget,
+                    GL_INVALID_OPERATION);
+   if (!src)
+      return;
 
-/**
- * See GL_ARB_map_buffer_range spec
- */
-void * GLAPIENTRY
-_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
-                     GLbitfield access)
+   dst = get_buffer(ctx, "glCopyBufferSubData", writeTarget,
+                    GL_INVALID_OPERATION);
+   if (!dst)
+      return;
+
+   _mesa_copy_buffer_sub_data(ctx, src, dst, readOffset, writeOffset, size,
+                              "glCopyBufferSubData");
+}
+
+void GLAPIENTRY
+_mesa_CopyNamedBufferSubData(GLuint readBuffer, GLuint writeBuffer,
+                             GLintptr readOffset, GLintptr writeOffset,
+                             GLsizeiptr size)
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *bufObj;
+   struct gl_buffer_object *src, *dst;
+
+   src = _mesa_lookup_bufferobj_err(ctx, readBuffer,
+                                    "glCopyNamedBufferSubData");
+   if (!src)
+      return;
+
+   dst = _mesa_lookup_bufferobj_err(ctx, writeBuffer,
+                                    "glCopyNamedBufferSubData");
+   if (!dst)
+      return;
+
+   _mesa_copy_buffer_sub_data(ctx, src, dst, readOffset, writeOffset, size,
+                              "glCopyNamedBufferSubData");
+}
+
+
+void *
+_mesa_map_buffer_range(struct gl_context *ctx,
+                       struct gl_buffer_object *bufObj,
+                       GLintptr offset, GLsizeiptr length,
+                       GLbitfield access, const char *func)
+{
    void *map;
    GLbitfield allowed_access;
 
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
 
-   if (!ctx->Extensions.ARB_map_buffer_range) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(extension not supported)");
-      return NULL;
-   }
-
    if (offset < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glMapBufferRange(offset = %ld)", (long)offset);
+                  "%s(offset %ld < 0)", func, (long) offset);
       return NULL;
    }
 
    if (length < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glMapBufferRange(length = %ld)", (long)length);
+                  "%s(length %ld < 0)", func, (long) length);
       return NULL;
    }
 
@@ -2096,10 +2255,13 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
     *     conditions:
     *
     *     * <length> is zero."
+    *
+    * Additionally, page 94 of the PDF of the OpenGL 4.5 core spec
+    * (30.10.2014) also says this, so it's no longer allowed for desktop GL,
+    * either.
     */
-   if (_mesa_is_gles(ctx) && length == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(length = 0)");
+   if (length == 0) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(length = 0)", func);
       return NULL;
    }
 
@@ -2116,14 +2278,15 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
    }
 
    if (access & ~allowed_access) {
-      /* generate an error if any other than allowed bit is set */
-      _mesa_error(ctx, GL_INVALID_VALUE, "glMapBufferRange(access)");
+      /* generate an error if any bits other than those allowed are set */
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "%s(access has undefined bits set)", func);
       return NULL;
    }
 
    if ((access & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) == 0) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(access indicates neither read or write)");
+                  "%s(access indicates neither read or write)", func);
       return NULL;
    }
 
@@ -2132,82 +2295,69 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
                   GL_MAP_INVALIDATE_BUFFER_BIT |
                   GL_MAP_UNSYNCHRONIZED_BIT))) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(invalid access flags)");
+                  "%s(read access with disallowed bits)", func);
       return NULL;
    }
 
    if ((access & GL_MAP_FLUSH_EXPLICIT_BIT) &&
        ((access & GL_MAP_WRITE_BIT) == 0)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(invalid access flags)");
+                  "%s(access has flush explicit without write)", func);
       return NULL;
    }
 
-   bufObj = get_buffer(ctx, "glMapBufferRange", target, GL_INVALID_OPERATION);
-   if (!bufObj)
-      return NULL;
-
    if (access & GL_MAP_READ_BIT &&
        !(bufObj->StorageFlags & GL_MAP_READ_BIT)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(invalid read flag)");
+                  "%s(buffer does not allow read access)", func);
       return NULL;
    }
 
    if (access & GL_MAP_WRITE_BIT &&
        !(bufObj->StorageFlags & GL_MAP_WRITE_BIT)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(invalid write flag)");
+                  "%s(buffer does not allow write access)", func);
       return NULL;
    }
 
    if (access & GL_MAP_COHERENT_BIT &&
        !(bufObj->StorageFlags & GL_MAP_COHERENT_BIT)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(invalid coherent flag)");
+                  "%s(buffer does not allow coherent access)", func);
       return NULL;
    }
 
    if (access & GL_MAP_PERSISTENT_BIT &&
        !(bufObj->StorageFlags & GL_MAP_PERSISTENT_BIT)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(invalid persistent flag)");
+                  "%s(buffer does not allow persistent access)", func);
       return NULL;
    }
 
    if (offset + length > bufObj->Size) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glMapBufferRange(offset + length > size)");
+                  "%s(offset %ld + length %ld > buffer_size %ld)", func,
+                  offset, length, bufObj->Size);
       return NULL;
    }
 
    if (_mesa_bufferobj_mapped(bufObj, MAP_USER)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(buffer already mapped)");
+                  "%s(buffer already mapped)", func);
       return NULL;
    }
 
    if (!bufObj->Size) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                  "glMapBufferRange(buffer size = 0)");
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s(buffer size = 0)", func);
       return NULL;
    }
 
-   /* Mapping zero bytes should return a non-null pointer. */
-   if (!length) {
-      static long dummy = 0;
-      bufObj->Mappings[MAP_USER].Pointer = &dummy;
-      bufObj->Mappings[MAP_USER].Length = length;
-      bufObj->Mappings[MAP_USER].Offset = offset;
-      bufObj->Mappings[MAP_USER].AccessFlags = access;
-      return bufObj->Mappings[MAP_USER].Pointer;
-   }
 
    assert(ctx->Driver.MapBufferRange);
    map = ctx->Driver.MapBufferRange(ctx, offset, length, access, bufObj,
                                     MAP_USER);
    if (!map) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(map failed)");
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s(map failed)", func);
    }
    else {
       /* The driver callback should have set all these fields.
@@ -2220,61 +2370,189 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
       assert(bufObj->Mappings[MAP_USER].AccessFlags == access);
    }
 
+   if (access & GL_MAP_WRITE_BIT)
+      bufObj->Written = GL_TRUE;
+
+#ifdef VBO_DEBUG
+   if (strstr(func, "Range") == NULL) { /* If not MapRange */
+      printf("glMapBuffer(%u, sz %ld, access 0x%x)\n",
+            bufObj->Name, bufObj->Size, access);
+      /* Access must be write only */
+      if ((access & GL_MAP_WRITE_BIT) && (!(access & ~GL_MAP_WRITE_BIT))) {
+         GLuint i;
+         GLubyte *b = (GLubyte *) bufObj->Pointer;
+         for (i = 0; i < bufObj->Size; i++)
+            b[i] = i & 0xff;
+      }
+   }
+#endif
+
+#ifdef BOUNDS_CHECK
+   if (strstr(func, "Range") == NULL) { /* If not MapRange */
+      GLubyte *buf = (GLubyte *) bufObj->Pointer;
+      GLuint i;
+      /* buffer is 100 bytes larger than requested, fill with magic value */
+      for (i = 0; i < 100; i++) {
+         buf[bufObj->Size - i - 1] = 123;
+      }
+   }
+#endif
+
    return map;
 }
 
+void * GLAPIENTRY
+_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
+                     GLbitfield access)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+
+   if (!ctx->Extensions.ARB_map_buffer_range) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(ARB_map_buffer_range not supported)");
+      return NULL;
+   }
+
+   bufObj = get_buffer(ctx, "glMapBufferRange", target, GL_INVALID_OPERATION);
+   if (!bufObj)
+      return NULL;
+
+   return _mesa_map_buffer_range(ctx, bufObj, offset, length, access,
+                                 "glMapBufferRange");
+}
+
+void * GLAPIENTRY
+_mesa_MapNamedBufferRange(GLuint buffer, GLintptr offset, GLsizeiptr length,
+                          GLbitfield access)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+
+   if (!ctx->Extensions.ARB_map_buffer_range) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapNamedBufferRange("
+                  "ARB_map_buffer_range not supported)");
+      return NULL;
+   }
+
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glMapNamedBufferRange");
+   if (!bufObj)
+      return NULL;
+
+   return _mesa_map_buffer_range(ctx, bufObj, offset, length, access,
+                                 "glMapNamedBufferRange");
+}
 
 /**
- * See GL_ARB_map_buffer_range spec
+ * Converts GLenum access from MapBuffer and MapNamedBuffer into
+ * flags for input to _mesa_map_buffer_range.
+ *
+ * \return true if the type of requested access is permissible.
  */
-void GLAPIENTRY
-_mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
+static bool
+get_map_buffer_access_flags(struct gl_context *ctx, GLenum access,
+                            GLbitfield *flags)
+{
+   switch (access) {
+   case GL_READ_ONLY_ARB:
+      *flags = GL_MAP_READ_BIT;
+      return _mesa_is_desktop_gl(ctx);
+   case GL_WRITE_ONLY_ARB:
+      *flags = GL_MAP_WRITE_BIT;
+      return true;
+   case GL_READ_WRITE_ARB:
+      *flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
+      return _mesa_is_desktop_gl(ctx);
+   default:
+      return false;
+   }
+}
+
+void * GLAPIENTRY
+_mesa_MapBuffer(GLenum target, GLenum access)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   GLbitfield accessFlags;
+
+   if (!get_map_buffer_access_flags(ctx, access, &accessFlags)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glMapBuffer(invalid access)");
+      return NULL;
+   }
+
+   bufObj = get_buffer(ctx, "glMapBuffer", target, GL_INVALID_OPERATION);
+   if (!bufObj)
+      return NULL;
+
+   return _mesa_map_buffer_range(ctx, bufObj, 0, bufObj->Size, accessFlags,
+                                 "glMapBuffer");
+}
+
+void * GLAPIENTRY
+_mesa_MapNamedBuffer(GLuint buffer, GLenum access)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *bufObj;
+   GLbitfield accessFlags;
 
+   if (!get_map_buffer_access_flags(ctx, access, &accessFlags)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glMapNamedBuffer(invalid access)");
+      return NULL;
+   }
+
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glMapNamedBuffer");
+   if (!bufObj)
+      return NULL;
+
+   return _mesa_map_buffer_range(ctx, bufObj, 0, bufObj->Size, accessFlags,
+                                 "glMapNamedBuffer");
+}
+
+
+void
+_mesa_flush_mapped_buffer_range(struct gl_context *ctx,
+                                struct gl_buffer_object *bufObj,
+                                GLintptr offset, GLsizeiptr length,
+                                const char *func)
+{
    if (!ctx->Extensions.ARB_map_buffer_range) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glFlushMappedBufferRange(extension not supported)");
+                  "%s(ARB_map_buffer_range not supported)", func);
       return;
    }
 
    if (offset < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glFlushMappedBufferRange(offset = %ld)", (long)offset);
+                  "%s(offset %ld < 0)", func, (long) offset);
       return;
    }
 
    if (length < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glFlushMappedBufferRange(length = %ld)", (long)length);
+                  "%s(length %ld < 0)", func, (long) length);
       return;
    }
 
-   bufObj = get_buffer(ctx, "glFlushMappedBufferRange", target,
-                       GL_INVALID_OPERATION);
-   if (!bufObj)
-      return;
-
    if (!_mesa_bufferobj_mapped(bufObj, MAP_USER)) {
       /* buffer is not mapped */
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glFlushMappedBufferRange(buffer is not mapped)");
+                  "%s(buffer is not mapped)", func);
       return;
    }
 
    if ((bufObj->Mappings[MAP_USER].AccessFlags &
         GL_MAP_FLUSH_EXPLICIT_BIT) == 0) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glFlushMappedBufferRange(GL_MAP_FLUSH_EXPLICIT_BIT not set)");
+                  "%s(GL_MAP_FLUSH_EXPLICIT_BIT not set)", func);
       return;
    }
 
    if (offset + length > bufObj->Mappings[MAP_USER].Length) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-		  "glFlushMappedBufferRange(offset %ld + length %ld > mapped length %ld)",
-		  (long)offset, (long)length,
-                  (long)bufObj->Mappings[MAP_USER].Length);
+                  "%s(offset %ld + length %ld > mapped length %ld)", func,
+                  (long) offset, (long) length,
+                  (long) bufObj->Mappings[MAP_USER].Length);
       return;
    }
 
@@ -2285,6 +2563,38 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
                                          MAP_USER);
 }
 
+void GLAPIENTRY
+_mesa_FlushMappedBufferRange(GLenum target, GLintptr offset,
+                             GLsizeiptr length)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+
+   bufObj = get_buffer(ctx, "glFlushMappedBufferRange", target,
+                       GL_INVALID_OPERATION);
+   if (!bufObj)
+      return;
+
+   _mesa_flush_mapped_buffer_range(ctx, bufObj, offset, length,
+                                   "glFlushMappedBufferRange");
+}
+
+void GLAPIENTRY
+_mesa_FlushMappedNamedBufferRange(GLuint buffer, GLintptr offset,
+                                  GLsizeiptr length)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+
+   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer,
+                                       "glFlushMappedNamedBufferRange");
+   if (!bufObj)
+      return;
+
+   _mesa_flush_mapped_buffer_range(ctx, bufObj, offset, length,
+                                   "glFlushMappedNamedBufferRange");
+}
+
 
 static GLenum
 buffer_object_purgeable(struct gl_context *ctx, GLuint name, GLenum option)
diff --git a/mesalib/src/mesa/main/bufferobj.h b/mesalib/src/mesa/main/bufferobj.h
index fe294fc0b..b5d73aec0 100644
--- a/mesalib/src/mesa/main/bufferobj.h
+++ b/mesalib/src/mesa/main/bufferobj.h
@@ -89,6 +89,10 @@ _mesa_lookup_bufferobj(struct gl_context *ctx, GLuint buffer);
 extern struct gl_buffer_object *
 _mesa_lookup_bufferobj_locked(struct gl_context *ctx, GLuint buffer);
 
+extern struct gl_buffer_object *
+_mesa_lookup_bufferobj_err(struct gl_context *ctx, GLuint buffer,
+                           const char *caller);
+
 extern void
 _mesa_begin_bufferobj_lookups(struct gl_context *ctx);
 
@@ -126,15 +130,62 @@ extern void
 _mesa_init_buffer_object_functions(struct dd_function_table *driver);
 
 extern void
+_mesa_buffer_storage(struct gl_context *ctx, struct gl_buffer_object *bufObj,
+                     GLenum target, GLsizeiptr size, const GLvoid *data,
+                     GLbitfield flags, const char *func);
+
+extern void
+_mesa_buffer_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
+                  GLenum target, GLsizeiptr size, const GLvoid *data,
+                  GLenum usage, const char *func);
+
+extern void
+_mesa_buffer_sub_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
+                      GLintptr offset, GLsizeiptr size, const GLvoid *data,
+                      const char *func);
+
+extern void
 _mesa_buffer_unmap_all_mappings(struct gl_context *ctx,
                                 struct gl_buffer_object *bufObj);
 
 extern void
-_mesa_buffer_clear_subdata(struct gl_context *ctx,
-                           GLintptr offset, GLsizeiptr size,
-                           const GLvoid *clearValue,
-                           GLsizeiptr clearValueSize,
-                           struct gl_buffer_object *bufObj);
+_mesa_copy_buffer_sub_data(struct gl_context *ctx,
+                           struct gl_buffer_object *src,
+                           struct gl_buffer_object *dst,
+                           GLintptr readOffset, GLintptr writeOffset,
+                           GLsizeiptr size, const char *func);
+
+extern void *
+_mesa_map_buffer_range(struct gl_context *ctx,
+                       struct gl_buffer_object *bufObj,
+                       GLintptr offset, GLsizeiptr length,
+                       GLbitfield access, const char *func);
+
+extern void
+_mesa_flush_mapped_buffer_range(struct gl_context *ctx,
+                                struct gl_buffer_object *bufObj,
+                                GLintptr offset, GLsizeiptr length,
+                                const char *func);
+
+extern void
+_mesa_ClearBufferSubData_sw(struct gl_context *ctx,
+                            GLintptr offset, GLsizeiptr size,
+                            const GLvoid *clearValue,
+                            GLsizeiptr clearValueSize,
+                            struct gl_buffer_object *bufObj);
+
+extern void
+_mesa_clear_buffer_sub_data(struct gl_context *ctx,
+                            struct gl_buffer_object *bufObj,
+                            GLenum internalformat,
+                            GLintptr offset, GLsizeiptr size,
+                            GLenum format, GLenum type,
+                            const GLvoid *data,
+                            const char *func, bool subdata);
+
+extern GLboolean
+_mesa_unmap_buffer(struct gl_context *ctx, struct gl_buffer_object *bufObj,
+                   const char *func);
 
 /*
  * API functions
@@ -146,7 +197,10 @@ void GLAPIENTRY
 _mesa_DeleteBuffers(GLsizei n, const GLuint * buffer);
 
 void GLAPIENTRY
-_mesa_GenBuffers(GLsizei n, GLuint * buffer);
+_mesa_GenBuffers(GLsizei n, GLuint *buffers);
+
+void GLAPIENTRY
+_mesa_CreateBuffers(GLsizei n, GLuint *buffers);
 
 GLboolean GLAPIENTRY
 _mesa_IsBuffer(GLuint buffer);
@@ -156,34 +210,61 @@ _mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
                     GLbitfield flags);
 
 void GLAPIENTRY
-_mesa_BufferData(GLenum target, GLsizeiptrARB size,
-                 const GLvoid * data, GLenum usage);
+_mesa_NamedBufferStorage(GLuint buffer, GLsizeiptr size, const GLvoid *data,
+                         GLbitfield flags);
+
+void GLAPIENTRY
+_mesa_BufferData(GLenum target, GLsizeiptr size,
+                 const GLvoid *data, GLenum usage);
+
+void GLAPIENTRY
+_mesa_NamedBufferData(GLuint buffer, GLsizeiptr size,
+                      const GLvoid *data, GLenum usage);
+
+void GLAPIENTRY
+_mesa_BufferSubData(GLenum target, GLintptr offset,
+                    GLsizeiptr size, const GLvoid *data);
 
 void GLAPIENTRY
-_mesa_BufferSubData(GLenum target, GLintptrARB offset,
-                    GLsizeiptrARB size, const GLvoid * data);
+_mesa_NamedBufferSubData(GLuint buffer, GLintptr offset,
+                         GLsizeiptr size, const GLvoid *data);
 
 void GLAPIENTRY
-_mesa_GetBufferSubData(GLenum target, GLintptrARB offset,
-                       GLsizeiptrARB size, void * data);
+_mesa_GetBufferSubData(GLenum target, GLintptr offset,
+                       GLsizeiptr size, GLvoid *data);
+
+void GLAPIENTRY
+_mesa_GetNamedBufferSubData(GLuint buffer, GLintptr offset,
+                            GLsizeiptr size, GLvoid *data);
 
 void GLAPIENTRY
 _mesa_ClearBufferData(GLenum target, GLenum internalformat,
                       GLenum format, GLenum type,
-                      const GLvoid * data);
+                      const GLvoid *data);
+
+void GLAPIENTRY
+_mesa_ClearNamedBufferData(GLuint buffer, GLenum internalformat,
+                           GLenum format, GLenum type,
+                           const GLvoid *data);
 
 void GLAPIENTRY
 _mesa_ClearBufferSubData(GLenum target, GLenum internalformat,
                          GLintptr offset, GLsizeiptr size,
                          GLenum format, GLenum type,
-                         const GLvoid * data);
+                         const GLvoid *data);
 
-void * GLAPIENTRY
-_mesa_MapBuffer(GLenum target, GLenum access);
+void GLAPIENTRY
+_mesa_ClearNamedBufferSubData(GLuint buffer, GLenum internalformat,
+                              GLintptr offset, GLsizeiptr size,
+                              GLenum format, GLenum type,
+                              const GLvoid *data);
 
 GLboolean GLAPIENTRY
 _mesa_UnmapBuffer(GLenum target);
 
+GLboolean GLAPIENTRY
+_mesa_UnmapNamedBuffer(GLuint buffer);
+
 void GLAPIENTRY
 _mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params);
 
@@ -191,21 +272,52 @@ void GLAPIENTRY
 _mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params);
 
 void GLAPIENTRY
+_mesa_GetNamedBufferParameteriv(GLuint buffer, GLenum pname, GLint *params);
+
+void GLAPIENTRY
+_mesa_GetNamedBufferParameteri64v(GLuint buffer, GLenum pname,
+                                  GLint64 *params);
+
+void GLAPIENTRY
 _mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params);
 
 void GLAPIENTRY
+_mesa_GetNamedBufferPointerv(GLuint buffer, GLenum pname, GLvoid **params);
+
+
+void GLAPIENTRY
 _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
                         GLintptr readOffset, GLintptr writeOffset,
                         GLsizeiptr size);
 
+void GLAPIENTRY
+_mesa_CopyNamedBufferSubData(GLuint readBuffer, GLuint writeBuffer,
+                             GLintptr readOffset, GLintptr writeOffset,
+                             GLsizeiptr size);
+
 void * GLAPIENTRY
 _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
                      GLbitfield access);
 
+void * GLAPIENTRY
+_mesa_MapNamedBufferRange(GLuint buffer, GLintptr offset, GLsizeiptr length,
+                          GLbitfield access);
+
+void * GLAPIENTRY
+_mesa_MapBuffer(GLenum target, GLenum access);
+
+void * GLAPIENTRY
+_mesa_MapNamedBuffer(GLuint buffer, GLenum access);
+
+
 void GLAPIENTRY
 _mesa_FlushMappedBufferRange(GLenum target,
                              GLintptr offset, GLsizeiptr length);
 
+void GLAPIENTRY
+_mesa_FlushMappedNamedBufferRange(GLuint buffer, GLintptr offset,
+                                  GLsizeiptr length);
+
 GLenum GLAPIENTRY
 _mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option);
 
diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h
index 95581fb49..55152fdef 100644
--- a/mesalib/src/mesa/main/compiler.h
+++ b/mesalib/src/mesa/main/compiler.h
@@ -57,29 +57,6 @@ extern "C" {
 # elif !defined(__sparc__) && defined(__sparc)
 #  define __sparc__
 # endif
-# if !defined(__volatile)
-#  define __volatile volatile
-# endif
-#endif
-
-
-/**
- * Disable assorted warnings
- */
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#  if !defined(__GNUC__) /* mingw environment */
-#    pragma warning( disable : 4068 ) /* unknown pragma */
-#    pragma warning( disable : 4710 ) /* function 'foo' not inlined */
-#    pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
-#    pragma warning( disable : 4127 ) /* conditional expression is constant */
-#    if defined(MESA_MINWARN)
-#      pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
-#      pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
-#      pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
-#      pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */
-#      pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
-#    endif
-#  endif
 #endif
 
 
@@ -101,14 +78,6 @@ extern "C" {
 #elif defined(__APPLE__)
 #include <CoreFoundation/CFByteOrder.h>
 #define CPU_TO_LE32( x )	CFSwapInt32HostToLittle( x )
-#elif (defined(_AIX))
-static inline GLuint CPU_TO_LE32(GLuint x)
-{
-   return (((x & 0x000000ff) << 24) |
-           ((x & 0x0000ff00) <<  8) |
-           ((x & 0x00ff0000) >>  8) |
-           ((x & 0xff000000) >> 24));
-}
 #elif defined(__OpenBSD__)
 #include <sys/types.h>
 #define CPU_TO_LE32( x )	htole32( x )
@@ -125,34 +94,6 @@ static inline GLuint CPU_TO_LE32(GLuint x)
 
 
 
-/**
- * Create a macro so that asm functions can be linked into compilers other
- * than GNU C
- */
-#ifndef _ASMAPI
-#if defined(_WIN32)
-#define _ASMAPI __cdecl
-#else
-#define _ASMAPI
-#endif
-#ifdef	PTR_DECL_IN_FRONT
-#define	_ASMAPIP * _ASMAPI
-#else
-#define	_ASMAPIP _ASMAPI *
-#endif
-#endif
-
-
-/**
- * LONGSTRING macro
- * gcc -pedantic warns about long string literals, LONGSTRING silences that.
- */
-#if !defined(__GNUC__)
-# define LONGSTRING
-#else
-# define LONGSTRING __extension__
-#endif
-
 #define IEEE_ONE 0x3f800000
 
 
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index 22c2341d6..c1acda980 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -882,18 +882,35 @@ update_default_objects(struct gl_context *ctx)
 
 
 /**
- * This is the default function we plug into all dispatch table slots
- * This helps prevents a segfault when someone calls a GL function without
- * first checking if the extension's supported.
+ * This function is called by the glapi no-op functions.  For each OpenGL
+ * function/entrypoint there's a simple no-op function.  These "no-op"
+ * functions call this function.
+ *
+ * If there's a current OpenGL context for the calling thread, we record a
+ * GL_INVALID_OPERATION error.  This can happen either because the app's
+ * calling an unsupported extension function, or calling an illegal function
+ * (such as glClear between glBegin/glEnd).
+ *
+ * If there's no current OpenGL context for the calling thread, we can
+ * print a message to stderr.
+ *
+ * \param name  the name of the OpenGL function, without the "gl" prefix
  */
-int
-_mesa_generic_nop(void)
+static void
+nop_handler(const char *name)
 {
    GET_CURRENT_CONTEXT(ctx);
-   _mesa_error(ctx, GL_INVALID_OPERATION,
-               "unsupported function called "
-               "(unsupported extension or deprecated function?)");
-   return 0;
+   if (ctx) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "gl%s(invalid call)", name);
+   }
+#if defined(DEBUG)
+   else if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG")) {
+      fprintf(stderr,
+              "GL User Error: gl%s called without a rendering context\n",
+              name);
+      fflush(stderr);
+   }
+#endif
 }
 
 
@@ -909,16 +926,13 @@ nop_glFlush(void)
 #endif
 
 
-extern void (*__glapi_noop_table[])(void);
-
-
 /**
- * Allocate and initialize a new dispatch table.  All the dispatch
- * function pointers will point at the _mesa_generic_nop() function
- * which raises GL_INVALID_OPERATION.
+ * Allocate and initialize a new dispatch table.  The table will be
+ * populated with pointers to "no-op" functions.  In turn, the no-op
+ * functions will call nop_handler() above.
  */
-struct _glapi_table *
-_mesa_alloc_dispatch_table(void)
+static struct _glapi_table *
+alloc_dispatch_table(void)
 {
    /* Find the larger of Mesa's dispatch table and libGL's dispatch table.
     * In practice, this'll be the same for stand-alone Mesa.  But for DRI
@@ -926,23 +940,10 @@ _mesa_alloc_dispatch_table(void)
     * DRI drivers.
     */
    GLint numEntries = MAX2(_glapi_get_dispatch_table_size(), _gloffset_COUNT);
-   struct _glapi_table *table;
-
-   table = malloc(numEntries * sizeof(_glapi_proc));
-   if (table) {
-      _glapi_proc *entry = (_glapi_proc *) table;
-      GLint i;
-      for (i = 0; i < numEntries; i++) {
-#if defined(_WIN32)
-         /* FIXME: This will not generate an error, but at least it won't
-          * corrupt the stack like _mesa_generic_nop does. */
-         entry[i] = __glapi_noop_table[i];
-#else
-         entry[i] = (_glapi_proc) _mesa_generic_nop;
-#endif
-      }
+   struct _glapi_table *table = _glapi_new_nop_table(numEntries);
 
 #if defined(_WIN32)
+   if (table) {
       /* This is a special case for Windows in the event that
        * wglGetProcAddress is called between glBegin/End().
        *
@@ -960,8 +961,11 @@ _mesa_alloc_dispatch_table(void)
        * assertion passes and the test continues.
        */
       SET_Flush(table, nop_glFlush);
-#endif
    }
+#endif
+
+   _glapi_set_nop_handler(nop_handler);
+
    return table;
 }
 
@@ -997,7 +1001,7 @@ create_beginend_table(const struct gl_context *ctx)
 {
    struct _glapi_table *table;
 
-   table = _mesa_alloc_dispatch_table();
+   table = alloc_dispatch_table();
    if (!table)
       return NULL;
 
@@ -1136,7 +1140,7 @@ _mesa_initialize_context(struct gl_context *ctx,
       goto fail;
 
    /* setup the API dispatch tables with all nop functions */
-   ctx->OutsideBeginEnd = _mesa_alloc_dispatch_table();
+   ctx->OutsideBeginEnd = alloc_dispatch_table();
    if (!ctx->OutsideBeginEnd)
       goto fail;
    ctx->Exec = ctx->OutsideBeginEnd;
@@ -1163,7 +1167,7 @@ _mesa_initialize_context(struct gl_context *ctx,
    switch (ctx->API) {
    case API_OPENGL_COMPAT:
       ctx->BeginEnd = create_beginend_table(ctx);
-      ctx->Save = _mesa_alloc_dispatch_table();
+      ctx->Save = alloc_dispatch_table();
       if (!ctx->BeginEnd || !ctx->Save)
          goto fail;
 
diff --git a/mesalib/src/mesa/main/context.h b/mesalib/src/mesa/main/context.h
index d5650877e..1cd89a84a 100644
--- a/mesalib/src/mesa/main/context.h
+++ b/mesalib/src/mesa/main/context.h
@@ -175,9 +175,6 @@ _mesa_finish(struct gl_context *ctx);
 extern void
 _mesa_flush(struct gl_context *ctx);
 
-extern int
-_mesa_generic_nop(void);
-
 extern void GLAPIENTRY
 _mesa_Finish( void );
 
diff --git a/mesalib/src/mesa/main/copyimage.c b/mesalib/src/mesa/main/copyimage.c
index 455929dc2..fd22f2889 100644
--- a/mesalib/src/mesa/main/copyimage.c
+++ b/mesalib/src/mesa/main/copyimage.c
@@ -33,6 +33,12 @@
 #include "texobj.h"
 #include "fbobject.h"
 #include "textureview.h"
+#include "glformats.h"
+
+enum mesa_block_class {
+   BLOCK_CLASS_128_BITS,
+   BLOCK_CLASS_64_BITS
+};
 
 static bool
 prepare_target(struct gl_context *ctx, GLuint name, GLenum *target, int level,
@@ -253,6 +259,124 @@ check_region_bounds(struct gl_context *ctx, struct gl_texture_image *tex_image,
    return true;
 }
 
+static bool
+compressed_format_compatible(struct gl_context *ctx,
+                             GLenum compressedFormat, GLenum otherFormat)
+{
+   enum mesa_block_class compressedClass, otherClass;
+
+   /* Two view-incompatible compressed formats are never compatible. */
+   if (_mesa_is_compressed_format(ctx, otherFormat)) {
+      return false;
+   }
+
+   /*
+    * From ARB_copy_image spec:
+    *    Table 4.X.1 (Compatible internal formats for copying between
+    *                 compressed and uncompressed internal formats)
+    *    ---------------------------------------------------------------------
+    *    | Texel / | Uncompressed      |                                     |
+    *    | Block   | internal format   | Compressed internal format          |
+    *    | size    |                   |                                     |
+    *    ---------------------------------------------------------------------
+    *    | 128-bit | RGBA32UI,         | COMPRESSED_RGBA_S3TC_DXT3_EXT,      |
+    *    |         | RGBA32I,          | COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT,|
+    *    |         | RGBA32F           | COMPRESSED_RGBA_S3TC_DXT5_EXT,      |
+    *    |         |                   | COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT,|
+    *    |         |                   | COMPRESSED_RG_RGTC2,                |
+    *    |         |                   | COMPRESSED_SIGNED_RG_RGTC2,         |
+    *    |         |                   | COMPRESSED_RGBA_BPTC_UNORM,         |
+    *    |         |                   | COMPRESSED_SRGB_ALPHA_BPTC_UNORM,   |
+    *    |         |                   | COMPRESSED_RGB_BPTC_SIGNED_FLOAT,   |
+    *    |         |                   | COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT  |
+    *    ---------------------------------------------------------------------
+    *    | 64-bit  | RGBA16F, RG32F,   | COMPRESSED_RGB_S3TC_DXT1_EXT,       |
+    *    |         | RGBA16UI, RG32UI, | COMPRESSED_SRGB_S3TC_DXT1_EXT,      |
+    *    |         | RGBA16I, RG32I,   | COMPRESSED_RGBA_S3TC_DXT1_EXT,      |
+    *    |         | RGBA16,           | COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT,|
+    *    |         | RGBA16_SNORM      | COMPRESSED_RED_RGTC1,               |
+    *    |         |                   | COMPRESSED_SIGNED_RED_RGTC1         |
+    *    ---------------------------------------------------------------------
+    */
+
+   switch (compressedFormat) {
+      case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
+      case GL_COMPRESSED_RG_RGTC2:
+      case GL_COMPRESSED_SIGNED_RG_RGTC2:
+      case GL_COMPRESSED_RGBA_BPTC_UNORM:
+      case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
+      case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT:
+      case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
+         compressedClass = BLOCK_CLASS_128_BITS;
+         break;
+      case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_RED_RGTC1:
+      case GL_COMPRESSED_SIGNED_RED_RGTC1:
+         compressedClass = BLOCK_CLASS_64_BITS;
+         break;
+      default:
+         return false;
+   }
+
+   switch (otherFormat) {
+      case GL_RGBA32UI:
+      case GL_RGBA32I:
+      case GL_RGBA32F:
+         otherClass = BLOCK_CLASS_128_BITS;
+         break;
+      case GL_RGBA16F:
+      case GL_RG32F:
+      case GL_RGBA16UI:
+      case GL_RG32UI:
+      case GL_RGBA16I:
+      case GL_RG32I:
+      case GL_RGBA16:
+      case GL_RGBA16_SNORM:
+         otherClass = BLOCK_CLASS_64_BITS;
+         break;
+      default:
+         return false;
+   }
+
+   return compressedClass == otherClass;
+}
+
+static bool
+copy_format_compatible(struct gl_context *ctx,
+                                GLenum srcFormat, GLenum dstFormat)
+{
+   /*
+    * From ARB_copy_image spec:
+    *    For the purposes of CopyImageSubData, two internal formats
+    *    are considered compatible if any of the following conditions are
+    *    met:
+    *    * the formats are the same,
+    *    * the formats are considered compatible according to the
+    *      compatibility rules used for texture views as defined in
+    *      section 3.9.X. In particular, if both internal formats are listed
+    *      in the same entry of Table 3.X.2, they are considered compatible, or
+    *    * one format is compressed and the other is uncompressed and
+    *      Table 4.X.1 lists the two formats in the same row.
+    */
+
+   if (_mesa_texture_view_compatible_format(ctx, srcFormat, dstFormat)) {
+      /* Also checks if formats are equal. */
+      return true;
+   } else if (_mesa_is_compressed_format(ctx, srcFormat)) {
+      return compressed_format_compatible(ctx, srcFormat, dstFormat);
+   } else if (_mesa_is_compressed_format(ctx, dstFormat)) {
+      return compressed_format_compatible(ctx, dstFormat, srcFormat);
+   }
+
+   return false;
+}
+
 void GLAPIENTRY
 _mesa_CopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel,
                        GLint srcX, GLint srcY, GLint srcZ,
@@ -265,7 +389,7 @@ _mesa_CopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel,
    struct gl_texture_object *srcTexObj, *dstTexObj;
    struct gl_texture_image *srcTexImage, *dstTexImage;
    GLuint src_bw, src_bh, dst_bw, dst_bh;
-   int i, srcNewZ, dstNewZ, Bpt;
+   int i, srcNewZ, dstNewZ;
 
    if (MESA_VERBOSE & VERBOSE_API)
       _mesa_debug(ctx, "glCopyImageSubData(%u, %s, %d, %d, %d, %d, "
@@ -306,15 +430,6 @@ _mesa_CopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel,
       goto cleanup;
    }
 
-   /* Very simple sanity check.  This is sufficient if one of the textures
-    * is compressed. */
-   Bpt = _mesa_get_format_bytes(srcTexImage->TexFormat);
-   if (_mesa_get_format_bytes(dstTexImage->TexFormat) != Bpt) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyImageSubData(internalFormat mismatch)");
-      goto cleanup;
-   }
-
    if (!check_region_bounds(ctx, srcTexImage, srcX, srcY, srcZ,
                             srcWidth, srcHeight, srcDepth, "src"))
       goto cleanup;
@@ -324,17 +439,11 @@ _mesa_CopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel,
                             (srcHeight / src_bh) * dst_bh, srcDepth, "dst"))
       goto cleanup;
 
-   if (_mesa_is_format_compressed(srcTexImage->TexFormat)) {
-      /* XXX: Technically, we should probaby do some more specific checking
-       * here.  However, this should be sufficient for all compressed
-       * formats that mesa supports since it is a direct memory copy.
-       */
-   } else if (_mesa_is_format_compressed(dstTexImage->TexFormat)) {
-   } else if (_mesa_texture_view_compatible_format(ctx,
-                                                   srcTexImage->InternalFormat,
-                                                   dstTexImage->InternalFormat)) {
-   } else {
-      return; /* Error logged by _mesa_texture_view_compatible_format */
+   if (!copy_format_compatible(ctx, srcTexImage->InternalFormat,
+                               dstTexImage->InternalFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glCopyImageSubData(internalFormat mismatch)");
+      goto cleanup;
    }
 
    for (i = 0; i < srcDepth; ++i) {
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index 422c9dc46..2bc8bcad9 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -388,7 +388,7 @@ array_formats_equal(const void *a, const void *b)
 }
 
 static void
-format_array_format_table_init()
+format_array_format_table_init(void)
 {
    const struct gl_format_info *info;
    mesa_array_format array_format;
diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c
index a7ffe2296..68c731657 100644
--- a/mesalib/src/mesa/main/imports.c
+++ b/mesalib/src/mesa/main/imports.c
@@ -45,6 +45,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include "c99_math.h"
+#include "util/rounding.h" /* for _mesa_roundeven */
 #include "imports.h"
 #include "context.h"
 #include "mtypes.h"
@@ -307,26 +308,6 @@ _mesa_bitcount_64(uint64_t n)
 #endif
 
 
-/* Using C99 rounding functions for roundToEven() implementation is
- * difficult, because round(), rint, and nearbyint() are affected by
- * fesetenv(), which the application may have done for its own
- * purposes.  Mesa's IROUND macro is close to what we want, but it
- * rounds away from 0 on n + 0.5.
- */
-int
-_mesa_round_to_even(float val)
-{
-   int rounded = IROUND(val);
-
-   if (val - floor(val) == 0.5) {
-      if (rounded % 2 != 0)
-         rounded += val > 0 ? -1 : 1;
-   }
-
-   return rounded;
-}
-
-
 /**
  * Convert a 4-byte float to a 2-byte half float.
  *
@@ -388,7 +369,7 @@ _mesa_float_to_half(float val)
           * or normal.
           */
          e = 0;
-         m = _mesa_round_to_even((1 << 24) * fabsf(fi.f));
+         m = (int) _mesa_roundevenf((1 << 24) * fabsf(fi.f));
       }
       else if (new_exp > 15) {
          /* map this value to infinity */
@@ -402,7 +383,7 @@ _mesa_float_to_half(float val)
           * either normal or infinite.
           */
          e = new_exp + 15;
-         m = _mesa_round_to_even(flt_m / (float) (1 << 13));
+         m = (int) _mesa_roundevenf(flt_m / (float) (1 << 13));
       }
    }
 
@@ -481,24 +462,6 @@ _mesa_half_to_float(GLhalfARB val)
 /** \name String */
 /*@{*/
 
-/**
- * Implemented using malloc() and strcpy.
- * Note that NULL is handled accordingly.
- */
-char *
-_mesa_strdup( const char *s )
-{
-   if (s) {
-      size_t l = strlen(s);
-      char *s2 = malloc(l + 1);
-      if (s2)
-         strcpy(s2, s);
-      return s2;
-   }
-   else {
-      return NULL;
-   }
-}
 
 /** Compute simple checksum/hash for a string */
 unsigned int
diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h
index c211b1555..8877966ec 100755
--- a/mesalib/src/mesa/main/imports.h
+++ b/mesalib/src/mesa/main/imports.h
@@ -432,9 +432,6 @@ _mesa_fls(unsigned int n)
 #endif
 }
 
-extern int
-_mesa_round_to_even(float val);
-
 extern GLhalfARB
 _mesa_float_to_half(float f);
 
@@ -447,9 +444,6 @@ _mesa_half_is_negative(GLhalfARB h)
    return h & 0x8000;
 }
 
-extern char *
-_mesa_strdup( const char *s );
-
 extern unsigned int
 _mesa_str_checksum(const char *str);
 
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index efeee8bff..8e1dba6f0 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -693,15 +693,16 @@ struct gl_colorbuffer_attrib
     * \name Logic op
     */
    /*@{*/
-   GLenum LogicOp;			/**< Logic operator */
    GLboolean IndexLogicOpEnabled;	/**< Color index logic op enabled flag */
    GLboolean ColorLogicOpEnabled;	/**< RGBA logic op enabled flag */
+   GLenum LogicOp;			/**< Logic operator */
+
    /*@}*/
 
    GLboolean DitherFlag;		/**< Dither enable flag */
 
-   GLenum ClampFragmentColor; /**< GL_TRUE, GL_FALSE or GL_FIXED_ONLY_ARB */
    GLboolean _ClampFragmentColor; /** < with GL_FIXED_ONLY_ARB resolved */
+   GLenum ClampFragmentColor; /**< GL_TRUE, GL_FALSE or GL_FIXED_ONLY_ARB */
    GLenum ClampReadColor;     /**< GL_TRUE, GL_FALSE or GL_FIXED_ONLY_ARB */
 
    GLboolean sRGBEnabled;    /**< Framebuffer sRGB blending/updating requested */
@@ -799,6 +800,7 @@ struct gl_eval_attrib
 struct gl_fog_attrib
 {
    GLboolean Enabled;		/**< Fog enabled flag */
+   GLboolean ColorSumEnabled;
    GLfloat ColorUnclamped[4];            /**< Fog color */
    GLfloat Color[4];		/**< Fog color */
    GLfloat Density;		/**< Density >= 0.0 */
@@ -806,7 +808,6 @@ struct gl_fog_attrib
    GLfloat End;			/**< End distance in eye coords */
    GLfloat Index;		/**< Fog index */
    GLenum Mode;			/**< Fog mode */
-   GLboolean ColorSumEnabled;
    GLenum FogCoordinateSource;  /**< GL_EXT_fog_coord */
    GLfloat _Scale;		/**< (End == Start) ? 1.0 : 1.0 / (End - Start) */
    GLenum FogDistanceMode;     /**< GL_NV_fog_distance */
@@ -846,16 +847,17 @@ struct gl_light_attrib
    struct gl_material Material;
 
    GLboolean Enabled;			/**< Lighting enabled flag */
+   GLboolean ColorMaterialEnabled;
+
    GLenum ShadeModel;			/**< GL_FLAT or GL_SMOOTH */
    GLenum ProvokingVertex;              /**< GL_EXT_provoking_vertex */
    GLenum ColorMaterialFace;		/**< GL_FRONT, BACK or FRONT_AND_BACK */
    GLenum ColorMaterialMode;		/**< GL_AMBIENT, GL_DIFFUSE, etc */
    GLbitfield _ColorMaterialBitmask;	/**< bitmask formed from Face and Mode */
-   GLboolean ColorMaterialEnabled;
-   GLenum ClampVertexColor;             /**< GL_TRUE, GL_FALSE, GL_FIXED_ONLY */
-   GLboolean _ClampVertexColor;
 
-   struct gl_light EnabledList;         /**< List sentinel */
+
+   GLboolean _ClampVertexColor;
+   GLenum ClampVertexColor;             /**< GL_TRUE, GL_FALSE, GL_FIXED_ONLY */
 
    /** 
     * Derived state for optimizations: 
@@ -863,6 +865,8 @@ struct gl_light_attrib
    /*@{*/
    GLboolean _NeedEyeCoords;		
    GLboolean _NeedVertices;		/**< Use fast shader? */
+   struct gl_light EnabledList;         /**< List sentinel */
+
    GLfloat _BaseColor[2][3];
    /*@}*/
 };
@@ -900,13 +904,15 @@ struct gl_multisample_attrib
    GLboolean SampleAlphaToCoverage;
    GLboolean SampleAlphaToOne;
    GLboolean SampleCoverage;
-   GLfloat SampleCoverageValue;
    GLboolean SampleCoverageInvert;
    GLboolean SampleShading;
-   GLfloat MinSampleShadingValue;
 
    /* ARB_texture_multisample / GL3.2 additions */
    GLboolean SampleMask;
+
+   GLfloat SampleCoverageValue;
+   GLfloat MinSampleShadingValue;
+
    /** The GL spec defines this as an array but >32x MSAA is madness */
    GLbitfield SampleMaskValue;
 };
@@ -977,11 +983,11 @@ struct gl_pixel_attrib
  */
 struct gl_point_attrib
 {
-   GLboolean SmoothFlag;	/**< True if GL_POINT_SMOOTH is enabled */
    GLfloat Size;		/**< User-specified point size */
    GLfloat Params[3];		/**< GL_EXT_point_parameters */
    GLfloat MinSize, MaxSize;	/**< GL_EXT_point_parameters */
    GLfloat Threshold;		/**< GL_EXT_point_parameters */
+   GLboolean SmoothFlag;	/**< True if GL_POINT_SMOOTH is enabled */
    GLboolean _Attenuated;	/**< True if Params != [1, 0, 0] */
    GLboolean PointSprite;	/**< GL_NV/ARB_point_sprite */
    GLboolean CoordReplace[MAX_TEXTURE_COORD_UNITS]; /**< GL_ARB_point_sprite*/
@@ -1347,6 +1353,9 @@ struct gl_texture_unit
 
    GLfloat LodBias;		/**< for biasing mipmap levels */
 
+   /** Texture targets that have a non-default texture bound */
+   GLbitfield _BoundTextures;
+
    /** Current sampler object (GL_ARB_sampler_objects) */
    struct gl_sampler_object *Sampler;
 
@@ -1373,8 +1382,6 @@ struct gl_texture_unit
    /** Points to highest priority, complete and enabled texture object */
    struct gl_texture_object *_Current;
 
-   /** Texture targets that have a non-default texture bound */
-   GLbitfield _BoundTextures;
 };
 
 
@@ -1384,16 +1391,15 @@ struct gl_texture_unit
 struct gl_texture_attrib
 {
    GLuint CurrentUnit;   /**< GL_ACTIVE_TEXTURE */
-   struct gl_texture_unit Unit[MAX_COMBINED_TEXTURE_IMAGE_UNITS];
+
+   /** GL_ARB_seamless_cubemap */
+   GLboolean CubeMapSeamless;
 
    struct gl_texture_object *ProxyTex[NUM_TEXTURE_TARGETS];
 
    /** GL_ARB_texture_buffer_object */
    struct gl_buffer_object *BufferObject;
 
-   /** GL_ARB_seamless_cubemap */
-   GLboolean CubeMapSeamless;
-
    /** Texture coord units/sets used for fragment texturing */
    GLbitfield _EnabledCoordUnits;
 
@@ -1411,6 +1417,8 @@ struct gl_texture_attrib
 
    /** Largest index + 1 of texture units that have had any CurrentTex set. */
    GLint NumCurrentTexUsed;
+
+   struct gl_texture_unit Unit[MAX_COMBINED_TEXTURE_IMAGE_UNITS];
 };
 
 
@@ -1536,12 +1544,12 @@ struct gl_client_array
    GLenum Format;               /**< default: GL_RGBA, but may be GL_BGRA */
    GLsizei Stride;		/**< user-specified stride */
    GLsizei StrideB;		/**< actual stride in bytes */
+   GLuint _ElementSize;         /**< size of each element in bytes */
    const GLubyte *Ptr;          /**< Points to array data */
    GLboolean Enabled;		/**< Enabled flag is a boolean */
    GLboolean Normalized;        /**< GL_ARB_vertex_program */
    GLboolean Integer;           /**< Integer-valued? */
    GLuint InstanceDivisor;      /**< GL_ARB_instanced_arrays */
-   GLuint _ElementSize;         /**< size of each element in bytes */
 
    struct gl_buffer_object *BufferObj;/**< GL_ARB_vertex_buffer_object */
 };
@@ -1600,9 +1608,11 @@ struct gl_vertex_array_object
 {
    /** Name of the VAO as received from glGenVertexArray. */
    GLuint Name;
-   GLchar *Label;       /**< GL_KHR_debug */
 
    GLint RefCount;
+
+   GLchar *Label;       /**< GL_KHR_debug */
+
    mtx_t Mutex;
 
    /**
@@ -1707,6 +1717,9 @@ struct gl_array_attrib
    GLuint RestartIndex;
    /*@}*/
 
+   /** One of the DRAW_xxx flags, not consumed by drivers */
+   gl_draw_method DrawMethod;
+
    /* GL_ARB_vertex_buffer_object */
    struct gl_buffer_object *ArrayBufferObj;
 
@@ -1716,9 +1729,6 @@ struct gl_array_attrib
     */
    const struct gl_client_array **_DrawArrays; /**< 0..VERT_ATTRIB_MAX-1 */
 
-   /** One of the DRAW_xxx flags, not consumed by drivers */
-   gl_draw_method DrawMethod;
-
    /** Legal array datatypes and the API for which they have been computed */
    GLbitfield LegalTypesMask;
    gl_api LegalTypesMaskAPI;
@@ -1880,8 +1890,8 @@ struct gl_transform_feedback_info
 struct gl_transform_feedback_object
 {
    GLuint Name;  /**< AKA the object ID */
-   GLchar *Label;     /**< GL_KHR_debug */
    GLint RefCount;
+   GLchar *Label;     /**< GL_KHR_debug */
    GLboolean Active;  /**< Is transform feedback enabled? */
    GLboolean Paused;  /**< Is transform feedback paused? */
    GLboolean EndedAnytime; /**< Has EndTransformFeedback been called
@@ -1889,14 +1899,6 @@ struct gl_transform_feedback_object
    GLboolean EverBound; /**< Has this object been bound? */
 
    /**
-    * The shader program active when BeginTransformFeedback() was called.
-    * When active and unpaused, this equals ctx->Shader.CurrentProgram[stage],
-    * where stage is the pipeline stage that is the source of data for
-    * transform feedback.
-    */
-   struct gl_shader_program *shader_program;
-
-   /**
     * GLES: if Active is true, remaining number of primitives which can be
     * rendered without overflow.  This is necessary to track because GLES
     * requires us to generate INVALID_OPERATION if a call to glDrawArrays or
@@ -1907,6 +1909,14 @@ struct gl_transform_feedback_object
     */
    unsigned GlesRemainingPrims;
 
+   /**
+    * The shader program active when BeginTransformFeedback() was called.
+    * When active and unpaused, this equals ctx->Shader.CurrentProgram[stage],
+    * where stage is the pipeline stage that is the source of data for
+    * transform feedback.
+    */
+   struct gl_shader_program *shader_program;
+
    /** The feedback buffers */
    GLuint BufferNames[MAX_FEEDBACK_BUFFERS];
    struct gl_buffer_object *Buffers[MAX_FEEDBACK_BUFFERS];
@@ -2229,8 +2239,9 @@ enum gl_frag_depth_layout
 struct gl_program
 {
    GLuint Id;
-   GLubyte *String;  /**< Null-terminated program text */
    GLint RefCount;
+   GLubyte *String;  /**< Null-terminated program text */
+
    GLenum Target;    /**< GL_VERTEX/FRAGMENT_PROGRAM_ARB, GL_GEOMETRY_PROGRAM_NV */
    GLenum Format;    /**< String encoding format */
 
@@ -2533,18 +2544,20 @@ struct gl_shader
    GLenum Type;
    gl_shader_stage Stage;
    GLuint Name;  /**< AKA the handle */
-   GLchar *Label;   /**< GL_KHR_debug */
    GLint RefCount;  /**< Reference count */
+   GLchar *Label;   /**< GL_KHR_debug */
    GLboolean DeletePending;
    GLboolean CompileStatus;
-   const GLchar *Source;  /**< Source code string */
+   bool IsES;              /**< True if this shader uses GLSL ES */
+
    GLuint SourceChecksum;       /**< for debug/logging purposes */
+   const GLchar *Source;  /**< Source code string */
+
    struct gl_program *Program;  /**< Post-compile assembly code */
    GLchar *InfoLog;
    struct gl_sl_pragmas Pragmas;
 
    unsigned Version;       /**< GLSL version used for linking */
-   GLboolean IsES;         /**< True if this shader uses GLSL ES */
 
    /**
     * \name Sampler tracking
@@ -2588,8 +2601,8 @@ struct gl_shader
     *
     * These fields are only set post-linking.
     */
-   struct gl_uniform_block *UniformBlocks;
    unsigned NumUniformBlocks;
+   struct gl_uniform_block *UniformBlocks;
 
    struct exec_list *ir;
    struct glsl_symbol_table *symbols;
@@ -2879,8 +2892,8 @@ struct gl_shader_program
     */
    unsigned LastClipDistanceArraySize;
 
-   struct gl_uniform_block *UniformBlocks;
    unsigned NumUniformBlocks;
+   struct gl_uniform_block *UniformBlocks;
 
    /**
     * Indices into the _LinkedShaders's UniformBlocks[] array for each stage
@@ -2911,7 +2924,7 @@ struct gl_shader_program
    GLchar *InfoLog;
 
    unsigned Version;       /**< GLSL version used for linking */
-   GLboolean IsES;         /**< True if this program uses GLSL ES */
+   bool IsES;              /**< True if this program uses GLSL ES */
 
    /**
     * Per-stage shaders resulting from the first stage of linking.
@@ -3036,7 +3049,7 @@ struct gl_shader_compiler_options
 
    struct gl_sl_pragmas DefaultPragmas; /**< Default #pragma settings */
 
-   struct nir_shader_compiler_options *NirOptions;
+   const struct nir_shader_compiler_options *NirOptions;
 };
 
 
@@ -3265,9 +3278,10 @@ struct gl_framebuffer
     * polygon face orientation, and polygon stipple will have to be inverted.
     */
    GLuint Name;
+   GLint RefCount;
+
    GLchar *Label;       /**< GL_KHR_debug */
 
-   GLint RefCount;
    GLboolean DeletePending;
 
    /**
@@ -3301,6 +3315,13 @@ struct gl_framebuffer
    GLboolean _AllColorBuffersFixedPoint; /* no integer, no float */
    GLboolean _HasSNormOrFloatColorBuffer;
 
+   /**
+    * The maximum number of layers in the framebuffer, or 0 if the framebuffer
+    * is not layered.  For cube maps and cube map arrays, each cube face
+    * counts as a layer.
+    */
+   GLuint MaxNumLayers;
+
    /** Array of all renderbuffer attachments, indexed by BUFFER_* tokens. */
    struct gl_renderbuffer_attachment Attachment[BUFFER_COUNT];
 
@@ -3317,13 +3338,6 @@ struct gl_framebuffer
    struct gl_renderbuffer *_ColorDrawBuffers[MAX_DRAW_BUFFERS];
    struct gl_renderbuffer *_ColorReadBuffer;
 
-   /**
-    * The maximum number of layers in the framebuffer, or 0 if the framebuffer
-    * is not layered.  For cube maps and cube map arrays, each cube face
-    * counts as a layer.
-    */
-   GLuint MaxNumLayers;
-
    /** Delete this framebuffer */
    void (*Delete)(struct gl_framebuffer *fb);
 };
@@ -4161,6 +4175,13 @@ struct gl_image_unit
    GLboolean Layered;
 
    /**
+    * GL_TRUE if the state of this image unit is valid and access from
+    * the shader is allowed.  Otherwise loads from this unit should
+    * return zero and stores should have no effect.
+    */
+   GLboolean _Valid;
+
+   /**
     * Layer of the texture object bound to this unit, or zero if the
     * whole level is bound.
     */
@@ -4184,12 +4205,6 @@ struct gl_image_unit
     */
    mesa_format _ActualFormat;
 
-   /**
-    * GL_TRUE if the state of this image unit is valid and access from
-    * the shader is allowed.  Otherwise loads from this unit should
-    * return zero and stores should have no effect.
-    */
-   GLboolean _Valid;
 };
 
 /**
diff --git a/mesalib/src/mesa/main/objectlabel.c b/mesalib/src/mesa/main/objectlabel.c
index 78df96b9b..aecb5b1fa 100644
--- a/mesalib/src/mesa/main/objectlabel.c
+++ b/mesalib/src/mesa/main/objectlabel.c
@@ -76,7 +76,7 @@ set_label(struct gl_context *ctx, char **labelPtr, const char *label,
                 MAX_LABEL_LENGTH);
 
          /* null-terminated string */
-         *labelPtr = _mesa_strdup(label);
+         *labelPtr = strdup(label);
       }
    }
 }
diff --git a/mesalib/src/mesa/main/pbo.c b/mesalib/src/mesa/main/pbo.c
index 5c906ed74..0c1602532 100644
--- a/mesalib/src/mesa/main/pbo.c
+++ b/mesalib/src/mesa/main/pbo.c
@@ -80,7 +80,7 @@ _mesa_validate_pbo_access(GLuint dimensions,
     */
    if (!_mesa_is_bufferobj(pack->BufferObj)) {
       offset = 0;
-      size = clientMemSize;
+      size = (clientMemSize == INT_MAX) ? UINTPTR_MAX : clientMemSize;
    } else {
       offset = (uintptr_t)ptr;
       size = pack->BufferObj->Size;
@@ -164,23 +164,18 @@ _mesa_map_pbo_source(struct gl_context *ctx,
    return buf;
 }
 
-
 /**
- * Combine PBO-read validation and mapping.
- * If any GL errors are detected, they'll be recorded and NULL returned.
+ * Perform PBO validation for read operations with uncompressed textures.
+ * If any GL errors are detected, false is returned, otherwise returns true.
  * \sa _mesa_validate_pbo_access
- * \sa _mesa_map_pbo_source
- * A call to this function should have a matching call to
- * _mesa_unmap_pbo_source().
  */
-const GLvoid *
-_mesa_map_validate_pbo_source(struct gl_context *ctx,
-                              GLuint dimensions,
-                              const struct gl_pixelstore_attrib *unpack,
-                              GLsizei width, GLsizei height, GLsizei depth,
-                              GLenum format, GLenum type,
-                              GLsizei clientMemSize,
-                              const GLvoid *ptr, const char *where)
+bool
+_mesa_validate_pbo_source(struct gl_context *ctx, GLuint dimensions,
+                          const struct gl_pixelstore_attrib *unpack,
+                          GLsizei width, GLsizei height, GLsizei depth,
+                          GLenum format, GLenum type,
+                          GLsizei clientMemSize,
+                          const GLvoid *ptr, const char *where)
 {
    assert(dimensions == 1 || dimensions == 2 || dimensions == 3);
 
@@ -188,24 +183,85 @@ _mesa_map_validate_pbo_source(struct gl_context *ctx,
                                   format, type, clientMemSize, ptr)) {
       if (_mesa_is_bufferobj(unpack->BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "%s(out of bounds PBO access)", where);
+                     "%s(out of bounds PBO access)",
+                     where);
       } else {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "%s(out of bounds access: bufSize (%d) is too small)",
                      where, clientMemSize);
       }
-      return NULL;
+      return false;
    }
 
    if (!_mesa_is_bufferobj(unpack->BufferObj)) {
       /* non-PBO access: no further validation to be done */
-      return ptr;
+      return true;
    }
 
    if (_mesa_check_disallowed_mapping(unpack->BufferObj)) {
       /* buffer is already mapped - that's an error */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
-      return NULL;
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)",
+                  where);
+      return false;
+   }
+
+   return true;
+}
+
+/**
+ * Perform PBO validation for read operations with compressed textures.
+ * If any GL errors are detected, false is returned, otherwise returns true.
+ */
+bool
+_mesa_validate_pbo_source_compressed(struct gl_context *ctx, GLuint dimensions,
+                                     const struct gl_pixelstore_attrib *unpack,
+                                     GLsizei imageSize, const GLvoid *pixels,
+                                     const char *where)
+{
+   if (!_mesa_is_bufferobj(unpack->BufferObj)) {
+      /* not using a PBO */
+      return true;
+   }
+
+   if ((const GLubyte *) pixels + imageSize >
+       ((const GLubyte *) 0) + unpack->BufferObj->Size) {
+      /* out of bounds read! */
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(invalid PBO access)",
+                  where);
+      return false;
+   }
+
+   if (_mesa_check_disallowed_mapping(unpack->BufferObj)) {
+      /* buffer is already mapped - that's an error */
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)",
+                  where);
+      return false;
+   }
+
+   return true;
+}
+
+/**
+ * Perform PBO-read mapping.
+ * If any GL errors are detected, they'll be recorded and NULL returned.
+ * \sa _mesa_validate_pbo_source
+ * \sa _mesa_map_pbo_source
+ * A call to this function should have a matching call to
+ * _mesa_unmap_pbo_source().
+ */
+const GLvoid *
+_mesa_map_validate_pbo_source(struct gl_context *ctx,
+                              GLuint dimensions,
+                              const struct gl_pixelstore_attrib *unpack,
+                              GLsizei width, GLsizei height, GLsizei depth,
+                              GLenum format, GLenum type,
+                              GLsizei clientMemSize,
+                              const GLvoid *ptr, const char *where)
+{
+   if (!_mesa_validate_pbo_source(ctx, dimensions, unpack,
+                                  width, height, depth, format, type,
+                                  clientMemSize, ptr, where)) {
+     return NULL;
    }
 
    ptr = _mesa_map_pbo_source(ctx, unpack, ptr);
@@ -381,28 +437,27 @@ _mesa_validate_pbo_compressed_teximage(struct gl_context *ctx,
 {
    GLubyte *buf;
 
+   if (!_mesa_validate_pbo_source_compressed(ctx, dimensions, packing,
+                                             imageSize, pixels, funcName)) {
+     /* error is already set during validation */
+      return NULL;
+   }
+
    if (!_mesa_is_bufferobj(packing->BufferObj)) {
       /* not using a PBO - return pointer unchanged */
       return pixels;
    }
-   if ((const GLubyte *) pixels + imageSize >
-       ((const GLubyte *) 0) + packing->BufferObj->Size) {
-      /* out of bounds read! */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s%uD(invalid PBO access)",
-                  funcName, dimensions);
-      return NULL;
-   }
 
    buf = (GLubyte*) ctx->Driver.MapBufferRange(ctx, 0,
 					       packing->BufferObj->Size,
 					       GL_MAP_READ_BIT,
 					       packing->BufferObj,
                                                MAP_INTERNAL);
-   if (!buf) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s%uD(PBO is mapped)", funcName,
-                  dimensions);
-      return NULL;
-   }
+
+   /* Validation above already checked that PBO is not mapped, so buffer
+    * should not be null.
+    */
+   assert(buf);
 
    return ADD_POINTERS(buf, pixels);
 }
diff --git a/mesalib/src/mesa/main/pbo.h b/mesalib/src/mesa/main/pbo.h
index 9851ef1a1..b3f24e62b 100644
--- a/mesalib/src/mesa/main/pbo.h
+++ b/mesalib/src/mesa/main/pbo.h
@@ -92,4 +92,18 @@ _mesa_unmap_teximage_pbo(struct gl_context *ctx,
                          const struct gl_pixelstore_attrib *unpack);
 
 
+extern bool
+_mesa_validate_pbo_source(struct gl_context *ctx, GLuint dimensions,
+                          const struct gl_pixelstore_attrib *unpack,
+                          GLsizei width, GLsizei height, GLsizei depth,
+                          GLenum format, GLenum type,
+                          GLsizei clientMemSize,
+                          const GLvoid *ptr, const char *where);
+
+extern bool
+_mesa_validate_pbo_source_compressed(struct gl_context *ctx, GLuint dimensions,
+                                     const struct gl_pixelstore_attrib *unpack,
+                                     GLsizei imageSize, const GLvoid *ptr,
+                                     const char *where);
+
 #endif
diff --git a/mesalib/src/mesa/main/querymatrix.c b/mesalib/src/mesa/main/querymatrix.c
index ef8517571..18361c929 100644
--- a/mesalib/src/mesa/main/querymatrix.c
+++ b/mesalib/src/mesa/main/querymatrix.c
@@ -13,7 +13,7 @@
 
 
 #include <stdlib.h>
-#include <math.h>
+#include "c99_math.h"
 #include "glheader.h"
 #include "querymatrix.h"
 #include "main/get.h"
@@ -37,169 +37,120 @@
 #define INT_TO_FIXED(x) ((GLfixed) ((x) << 16))
 #define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0))
 
-#if defined(fpclassify)
-/* ISO C99 says that fpclassify is a macro.  Assume that any implementation
- * of fpclassify, whether it's in a C99 compiler or not, will be a macro.
- */
-#elif defined(_MSC_VER)
-/* Not required on VS2013 and above. */
-/* Oddly, the fpclassify() function doesn't exist in such a form
- * on MSVC.  This is an implementation using slightly different
- * lower-level Windows functions.
- */
-#include <float.h>
-
-enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}
-fpclassify(double x)
-{
-    switch(_fpclass(x)) {
-        case _FPCLASS_SNAN: /* signaling NaN */
-        case _FPCLASS_QNAN: /* quiet NaN */
-            return FP_NAN;
-        case _FPCLASS_NINF: /* negative infinity */
-        case _FPCLASS_PINF: /* positive infinity */
-            return FP_INFINITE;
-        case _FPCLASS_NN:   /* negative normal */
-        case _FPCLASS_PN:   /* positive normal */
-            return FP_NORMAL;
-        case _FPCLASS_ND:   /* negative denormalized */
-        case _FPCLASS_PD:   /* positive denormalized */
-            return FP_SUBNORMAL;
-        case _FPCLASS_NZ:   /* negative zero */
-        case _FPCLASS_PZ:   /* positive zero */
-            return FP_ZERO;
-        default:
-            /* Should never get here; but if we do, this will guarantee
-             * that the pattern is not treated like a number.
-             */
-            return FP_NAN;
-    }
-}
-
-#else
-
-enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}
-fpclassify(double x)
-{
-   /* XXX do something better someday */
-   return FP_NORMAL;
-}
-
-#endif
 
-GLbitfield GLAPIENTRY _mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
+GLbitfield GLAPIENTRY
+_mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
 {
-    GLfloat matrix[16];
-    GLint tmp;
-    GLenum currentMode = GL_FALSE;
-    GLenum desiredMatrix = GL_FALSE;
-    /* The bitfield returns 1 for each component that is invalid (i.e.
-     * NaN or Inf).  In case of error, everything is invalid.
-     */
-    GLbitfield rv;
-    register unsigned int i;
-    unsigned int bit;
-
-    /* This data structure defines the mapping between the current matrix
-     * mode and the desired matrix identifier.
-     */
-    static struct {
-        GLenum currentMode;
-        GLenum desiredMatrix;
-    } modes[] = {
-        {GL_MODELVIEW, GL_MODELVIEW_MATRIX},
-        {GL_PROJECTION, GL_PROJECTION_MATRIX},
-        {GL_TEXTURE, GL_TEXTURE_MATRIX},
-    };
-
-    /* Call Mesa to get the current matrix in floating-point form.  First,
-     * we have to figure out what the current matrix mode is.
-     */
-    _mesa_GetIntegerv(GL_MATRIX_MODE, &tmp);
-    currentMode = (GLenum) tmp;
-
-    /* The mode is either GL_FALSE, if for some reason we failed to query
-     * the mode, or a given mode from the above table.  Search for the
-     * returned mode to get the desired matrix; if we don't find it,
-     * we can return immediately, as _mesa_GetInteger() will have
-     * logged the necessary error already.
-     */
-    for (i = 0; i < sizeof(modes)/sizeof(modes[0]); i++) {
-        if (modes[i].currentMode == currentMode) {
-            desiredMatrix = modes[i].desiredMatrix;
-            break;
-        }
-    }
-    if (desiredMatrix == GL_FALSE) {
-        /* Early error means all values are invalid. */
-        return 0xffff;
-    }
-
-    /* Now pull the matrix itself. */
-    _mesa_GetFloatv(desiredMatrix, matrix);
-
-    rv = 0;
-    for (i = 0, bit = 1; i < 16; i++, bit<<=1) {
-        float normalizedFraction;
-        int exp;
-
-        switch (fpclassify(matrix[i])) {
-            /* A "subnormal" or denormalized number is too small to be
-             * represented in normal format; but despite that it's a
-             * valid floating point number.  FP_ZERO and FP_NORMAL
-             * are both valid as well.  We should be fine treating
-             * these three cases as legitimate floating-point numbers.
-             */
-            case FP_SUBNORMAL:
-            case FP_NORMAL:
-            case FP_ZERO:
-                normalizedFraction = (GLfloat)frexp(matrix[i], &exp);
-                mantissa[i] = FLOAT_TO_FIXED(normalizedFraction);
-                exponent[i] = (GLint) exp;
-                break;
-
-            /* If the entry is not-a-number or an infinity, then the
-             * matrix component is invalid.  The invalid flag for
-             * the component is already set; might as well set the
-             * other return values to known values.  We'll set
-             * distinct values so that a savvy end user could determine
-             * whether the matrix component was a NaN or an infinity,
-             * but this is more useful for debugging than anything else
-             * since the standard doesn't specify any such magic
-             * values to return.
-             */
-            case FP_NAN:
-                mantissa[i] = INT_TO_FIXED(0);
-                exponent[i] = (GLint) 0;
-                rv |= bit;
-                break;
-
-            case FP_INFINITE:
-                /* Return +/- 1 based on whether it's a positive or
-                 * negative infinity.
-                 */
-                if (matrix[i] > 0) {
-                    mantissa[i] = INT_TO_FIXED(1);
-                }
-                else {
-                    mantissa[i] = -INT_TO_FIXED(1);
-                }
-                exponent[i] = (GLint) 0;
-                rv |= bit;
-                break;
-
-            /* We should never get here; but here's a catching case
-             * in case fpclassify() is returnings something unexpected.
-             */
-            default:
-                mantissa[i] = INT_TO_FIXED(2);
-                exponent[i] = (GLint) 0;
-                rv |= bit;
-                break;
-        }
-
-    } /* for each component */
-
-    /* All done */
-    return rv;
+   GLfloat matrix[16];
+   GLint tmp;
+   GLenum currentMode = GL_FALSE;
+   GLenum desiredMatrix = GL_FALSE;
+   /* The bitfield returns 1 for each component that is invalid (i.e.
+    * NaN or Inf).  In case of error, everything is invalid.
+    */
+   GLbitfield rv;
+   unsigned i, bit;
+
+   /* This data structure defines the mapping between the current matrix
+    * mode and the desired matrix identifier.
+    */
+   static const struct {
+      GLenum currentMode;
+      GLenum desiredMatrix;
+   } modes[] = {
+      {GL_MODELVIEW, GL_MODELVIEW_MATRIX},
+      {GL_PROJECTION, GL_PROJECTION_MATRIX},
+      {GL_TEXTURE, GL_TEXTURE_MATRIX},
+   };
+
+   /* Call Mesa to get the current matrix in floating-point form.  First,
+    * we have to figure out what the current matrix mode is.
+    */
+   _mesa_GetIntegerv(GL_MATRIX_MODE, &tmp);
+   currentMode = (GLenum) tmp;
+
+   /* The mode is either GL_FALSE, if for some reason we failed to query
+    * the mode, or a given mode from the above table.  Search for the
+    * returned mode to get the desired matrix; if we don't find it,
+    * we can return immediately, as _mesa_GetInteger() will have
+    * logged the necessary error already.
+    */
+   for (i = 0; i < ARRAY_SIZE(modes); i++) {
+      if (modes[i].currentMode == currentMode) {
+         desiredMatrix = modes[i].desiredMatrix;
+         break;
+      }
+   }
+   if (desiredMatrix == GL_FALSE) {
+      /* Early error means all values are invalid. */
+      return 0xffff;
+   }
+
+   /* Now pull the matrix itself. */
+   _mesa_GetFloatv(desiredMatrix, matrix);
+
+   rv = 0;
+   for (i = 0, bit = 1; i < 16; i++, bit<<=1) {
+      float normalizedFraction;
+      int exp;
+
+      switch (fpclassify(matrix[i])) {
+      case FP_SUBNORMAL:
+      case FP_NORMAL:
+      case FP_ZERO:
+         /* A "subnormal" or denormalized number is too small to be
+          * represented in normal format; but despite that it's a
+          * valid floating point number.  FP_ZERO and FP_NORMAL
+          * are both valid as well.  We should be fine treating
+          * these three cases as legitimate floating-point numbers.
+          */
+         normalizedFraction = (GLfloat)frexp(matrix[i], &exp);
+         mantissa[i] = FLOAT_TO_FIXED(normalizedFraction);
+         exponent[i] = (GLint) exp;
+         break;
+
+      case FP_NAN:
+         /* If the entry is not-a-number or an infinity, then the
+          * matrix component is invalid.  The invalid flag for
+          * the component is already set; might as well set the
+          * other return values to known values.  We'll set
+          * distinct values so that a savvy end user could determine
+          * whether the matrix component was a NaN or an infinity,
+          * but this is more useful for debugging than anything else
+          * since the standard doesn't specify any such magic
+          * values to return.
+          */
+         mantissa[i] = INT_TO_FIXED(0);
+         exponent[i] = (GLint) 0;
+         rv |= bit;
+         break;
+
+      case FP_INFINITE:
+         /* Return +/- 1 based on whether it's a positive or
+          * negative infinity.
+          */
+         if (matrix[i] > 0) {
+            mantissa[i] = INT_TO_FIXED(1);
+         }
+         else {
+            mantissa[i] = -INT_TO_FIXED(1);
+         }
+         exponent[i] = (GLint) 0;
+         rv |= bit;
+         break;
+
+      default:
+         /* We should never get here; but here's a catching case
+          * in case fpclassify() is returnings something unexpected.
+          */
+         mantissa[i] = INT_TO_FIXED(2);
+         exponent[i] = (GLint) 0;
+         rv |= bit;
+         break;
+      }
+
+   } /* for each component */
+
+   /* All done */
+   return rv;
 }
diff --git a/mesalib/src/mesa/main/scissor.c b/mesalib/src/mesa/main/scissor.c
index 83f39e2a0..bc8224c7d 100644
--- a/mesalib/src/mesa/main/scissor.c
+++ b/mesalib/src/mesa/main/scissor.c
@@ -201,13 +201,13 @@ void GLAPIENTRY
 _mesa_ScissorIndexed(GLuint index, GLint left, GLint bottom,
                      GLsizei width, GLsizei height)
 {
-   ScissorIndexed(index, left, bottom, width, height, "glScissorIndexd");
+   ScissorIndexed(index, left, bottom, width, height, "glScissorIndexed");
 }
 
 void GLAPIENTRY
 _mesa_ScissorIndexedv(GLuint index, const GLint *v)
 {
-   ScissorIndexed(index, v[0], v[1], v[2], v[3], "glScissorIndexdv");
+   ScissorIndexed(index, v[0], v[1], v[2], v[3], "glScissorIndexedv");
 }
 
 /**
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index 5731d581a..30716f5e3 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -1027,15 +1027,14 @@ _mesa_active_program(struct gl_context *ctx, struct gl_shader_program *shProg,
 
 
 static void
-use_shader_program(struct gl_context *ctx, GLenum type,
+use_shader_program(struct gl_context *ctx, gl_shader_stage stage,
                    struct gl_shader_program *shProg,
                    struct gl_pipeline_object *shTarget)
 {
    struct gl_shader_program **target;
-   gl_shader_stage stage = _mesa_shader_enum_to_shader_stage(type);
 
    target = &shTarget->CurrentProgram[stage];
-   if ((shProg == NULL) || (shProg->_LinkedShaders[stage] == NULL))
+   if ((shProg != NULL) && (shProg->_LinkedShaders[stage] == NULL))
       shProg = NULL;
 
    if (*target != shProg) {
@@ -1048,17 +1047,17 @@ use_shader_program(struct gl_context *ctx, GLenum type,
        * it from that binding point as well.  This ensures that the correct
        * semantics of glDeleteProgram are maintained.
        */
-      switch (type) {
-      case GL_VERTEX_SHADER:
+      switch (stage) {
+      case MESA_SHADER_VERTEX:
 	 /* Empty for now. */
 	 break;
-      case GL_GEOMETRY_SHADER_ARB:
+      case MESA_SHADER_GEOMETRY:
 	 /* Empty for now. */
 	 break;
-      case GL_COMPUTE_SHADER:
+      case MESA_SHADER_COMPUTE:
          /* Empty for now. */
          break;
-      case GL_FRAGMENT_SHADER:
+      case MESA_SHADER_FRAGMENT:
          if (*target == ctx->_Shader->_CurrentFragmentProgram) {
 	    _mesa_reference_shader_program(ctx,
                                            &ctx->_Shader->_CurrentFragmentProgram,
@@ -1079,10 +1078,9 @@ use_shader_program(struct gl_context *ctx, GLenum type,
 void
 _mesa_use_program(struct gl_context *ctx, struct gl_shader_program *shProg)
 {
-   use_shader_program(ctx, GL_VERTEX_SHADER, shProg, &ctx->Shader);
-   use_shader_program(ctx, GL_GEOMETRY_SHADER_ARB, shProg, &ctx->Shader);
-   use_shader_program(ctx, GL_FRAGMENT_SHADER, shProg, &ctx->Shader);
-   use_shader_program(ctx, GL_COMPUTE_SHADER, shProg, &ctx->Shader);
+   int i;
+   for (i = 0; i < MESA_SHADER_STAGES; i++)
+      use_shader_program(ctx, i, shProg, &ctx->Shader);
    _mesa_active_program(ctx, shProg, "glUseProgram");
 
    if (ctx->Driver.UseProgram)
@@ -1460,7 +1458,7 @@ read_shader(const char *fname)
 
    fclose(f);
 
-   shader = _mesa_strdup(buffer);
+   shader = strdup(buffer);
    free(buffer);
 
    return shader;
@@ -1889,7 +1887,8 @@ _mesa_use_shader_program(struct gl_context *ctx, GLenum type,
                          struct gl_shader_program *shProg,
                          struct gl_pipeline_object *shTarget)
 {
-   use_shader_program(ctx, type, shProg, shTarget);
+   gl_shader_stage stage = _mesa_shader_enum_to_shader_stage(type);
+   use_shader_program(ctx, stage, shProg, shTarget);
 
    if (ctx->Driver.UseProgram)
       ctx->Driver.UseProgram(ctx, shProg);
diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c
index f975c160e..255d36559 100644
--- a/mesalib/src/mesa/main/texgetimage.c
+++ b/mesalib/src/mesa/main/texgetimage.c
@@ -1088,48 +1088,9 @@ _mesa_GetTextureImage(GLuint texture, GLint level, GLenum format,
    /* Must handle special case GL_TEXTURE_CUBE_MAP. */
    if (texObj->Target == GL_TEXTURE_CUBE_MAP) {
 
-      /* Error checking */
-      if (texObj->NumLayers < 6) {
-         /* Not enough image planes for a cube map.  The spec does not say
-          * what should happen in this case because the user has always
-          * specified each cube face separately (using
-          * GL_TEXTURE_CUBE_MAP_POSITIVE_X+i) in previous GL versions.
-          * This is addressed in Khronos Bug 13223.
-          */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetTextureImage(insufficient cube map storage)");
-         return;
-      }
-
-      /*
-       * What do we do if the user created a texture with the following code
-       * and then called this function with its handle?
-       *
-       *    GLuint tex;
-       *    glCreateTextures(GL_TEXTURE_CUBE_MAP, 1, &tex);
-       *    glBindTexture(GL_TEXTURE_CUBE_MAP, tex);
-       *    glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, ...);
-       *    glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, 0, ...);
-       *    glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, 0, ...);
-       *    // Note: GL_TEXTURE_CUBE_MAP_NEGATIVE_Y not set, or given the
-       *    // wrong format, or given the wrong size, etc.
-       *    glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, 0, ...);
-       *    glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, ...);
-       *
-       * A bug has been filed against the spec for this case.  In the
-       * meantime, we will check for cube completeness.
-       *
-       * According to Section 8.17 Texture Completeness in the OpenGL 4.5
-       * Core Profile spec (30.10.2014):
-       *    "[A] cube map texture is cube complete if the
-       *    following conditions all hold true: The [base level] texture
-       *    images of each of the six cube map faces have identical, positive,
-       *    and square dimensions. The [base level] images were each specified
-       *    with the same internal format."
-       *
-       * It seems reasonable to check for cube completeness of an arbitrary
-       * level here so that the returned data has a consistent format and size
-       * and therefore fits in the user's buffer.
+      /* Make sure the texture object is a proper cube.
+       * (See texturesubimage in teximage.c for details on why this check is
+       * performed.)
        */
       if (!_mesa_cube_level_complete(texObj, level)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -1140,6 +1101,8 @@ _mesa_GetTextureImage(GLuint texture, GLint level, GLenum format,
       /* Copy each face. */
       for (i = 0; i < 6; ++i) {
          texImage = texObj->Image[i][level];
+         assert(texImage);
+
          _mesa_get_texture_image(ctx, texObj, texImage, texObj->Target, level,
                                  format, type, bufSize, pixels, true);
 
@@ -1340,13 +1303,21 @@ _mesa_GetCompressedTextureImage(GLuint texture, GLint level,
 
    /* Must handle special case GL_TEXTURE_CUBE_MAP. */
    if (texObj->Target == GL_TEXTURE_CUBE_MAP) {
-      assert(texObj->NumLayers >= 6);
+
+      /* Make sure the texture object is a proper cube.
+       * (See texturesubimage in teximage.c for details on why this check is
+       * performed.)
+       */
+      if (!_mesa_cube_level_complete(texObj, level)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glGetCompressedTextureImage(cube map incomplete)");
+         return;
+      }
 
       /* Copy each face. */
       for (i = 0; i < 6; ++i) {
          texImage = texObj->Image[i][level];
-         if (!texImage)
-            return;
+         assert(texImage);
 
          _mesa_get_compressed_texture_image(ctx, texObj, texImage,
                                             texObj->Target, level,
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 611d664b6..8d9d7cfc1 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -53,6 +53,7 @@
 #include "mtypes.h"
 #include "glformats.h"
 #include "texstore.h"
+#include "pbo.h"
 
 
 /**
@@ -1619,32 +1620,30 @@ error_check_subtexture_dimensions(struct gl_context *ctx, GLuint dims,
    /* Check size */
    if (subWidth < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "%s%dD(width=%d)", func, dims, subWidth);
+                  "%s(width=%d)", func, subWidth);
       return GL_TRUE;
    }
 
    if (dims > 1 && subHeight < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "%s%dD(height=%d)", func, dims, subHeight);
+                  "%s(height=%d)", func, subHeight);
       return GL_TRUE;
    }
 
    if (dims > 2 && subDepth < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "%s%dD(depth=%d)", func, dims, subDepth);
+                  "%s(depth=%d)", func, subDepth);
       return GL_TRUE;
    }
 
    /* check xoffset and width */
    if (xoffset < - (GLint) destImage->Border) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "%s%dD(xoffset)",
-                  func, dims);
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(xoffset)", func);
       return GL_TRUE;
    }
 
    if (xoffset + subWidth > (GLint) destImage->Width) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "%s%dD(xoffset+width)",
-                  func, dims);
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(xoffset+width)", func);
       return GL_TRUE;
    }
 
@@ -1652,13 +1651,11 @@ error_check_subtexture_dimensions(struct gl_context *ctx, GLuint dims,
    if (dims > 1) {
       GLint yBorder = (target == GL_TEXTURE_1D_ARRAY) ? 0 : destImage->Border;
       if (yoffset < -yBorder) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "%s%dD(yoffset)",
-                     func, dims);
+         _mesa_error(ctx, GL_INVALID_VALUE, "%s(yoffset)", func);
          return GL_TRUE;
       }
       if (yoffset + subHeight > (GLint) destImage->Height) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "%s%dD(yoffset+height)",
-                     func, dims);
+         _mesa_error(ctx, GL_INVALID_VALUE, "%s(yoffset+height)", func);
          return GL_TRUE;
       }
    }
@@ -1671,7 +1668,7 @@ error_check_subtexture_dimensions(struct gl_context *ctx, GLuint dims,
                          0 : destImage->Border;
 
       if (zoffset < -zBorder) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "%s3D(zoffset)", func);
+         _mesa_error(ctx, GL_INVALID_VALUE, "%s(zoffset)", func);
          return GL_TRUE;
       }
 
@@ -1679,7 +1676,7 @@ error_check_subtexture_dimensions(struct gl_context *ctx, GLuint dims,
       if (target == GL_TEXTURE_CUBE_MAP)
          depth = 6;
       if (zoffset + subDepth  > depth) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "%s3D(zoffset+depth)", func);
+         _mesa_error(ctx, GL_INVALID_VALUE, "%s(zoffset+depth)", func);
          return GL_TRUE;
       }
    }
@@ -1697,8 +1694,8 @@ error_check_subtexture_dimensions(struct gl_context *ctx, GLuint dims,
       /* offset must be multiple of block size */
       if ((xoffset % bw != 0) || (yoffset % bh != 0)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "%s%dD(xoffset = %d, yoffset = %d)",
-                     func, dims, xoffset, yoffset);
+                     "%s(xoffset = %d, yoffset = %d)",
+                     func, xoffset, yoffset);
          return GL_TRUE;
       }
 
@@ -1710,14 +1707,14 @@ error_check_subtexture_dimensions(struct gl_context *ctx, GLuint dims,
       if ((subWidth % bw != 0) &&
           (xoffset + subWidth != (GLint) destImage->Width)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "%s%dD(width = %d)", func, dims, subWidth);
+                     "%s(width = %d)", func, subWidth);
          return GL_TRUE;
       }
 
       if ((subHeight % bh != 0) &&
           (yoffset + subHeight != (GLint) destImage->Height)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "%s%dD(height = %d)", func, dims, subHeight);
+                     "%s(height = %d)", func, subHeight);
          return GL_TRUE;
       }
    }
@@ -2113,7 +2110,8 @@ texture_error_check( struct gl_context *ctx,
                      GLint level, GLint internalFormat,
                      GLenum format, GLenum type,
                      GLint width, GLint height,
-                     GLint depth, GLint border )
+                     GLint depth, GLint border,
+                     const GLvoid *pixels )
 {
    GLenum err;
 
@@ -2198,6 +2196,13 @@ texture_error_check( struct gl_context *ctx,
       return GL_TRUE;
    }
 
+   /* validate the bound PBO, if any */
+   if (!_mesa_validate_pbo_source(ctx, dimensions, &ctx->Unpack,
+                                  width, height, depth, format, type,
+                                  INT_MAX, pixels, "glTexImage")) {
+      return GL_TRUE;
+   }
+
    /* make sure internal format and format basically agree */
    if (!texture_formats_agree(internalFormat, format)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -2294,7 +2299,7 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
                                GLenum target, GLint level,
                                GLenum internalFormat, GLsizei width,
                                GLsizei height, GLsizei depth, GLint border,
-                               GLsizei imageSize)
+                               GLsizei imageSize, const GLvoid *data)
 {
    const GLint maxLevels = _mesa_max_texture_levels(ctx, target);
    GLint expectedSize;
@@ -2322,6 +2327,13 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
       return GL_TRUE;
    }
 
+   /* validate the bound PBO, if any */
+   if (!_mesa_validate_pbo_source_compressed(ctx, dimensions, &ctx->Unpack,
+                                             imageSize, data,
+                                             "glCompressedTexImage")) {
+      return GL_TRUE;
+   }
+
    switch (internalFormat) {
    case GL_PALETTE4_RGB8_OES:
    case GL_PALETTE4_RGBA8_OES:
@@ -2454,30 +2466,28 @@ texsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
                         GLenum target, GLint level,
                         GLint xoffset, GLint yoffset, GLint zoffset,
                         GLint width, GLint height, GLint depth,
-                        GLenum format, GLenum type, bool dsa)
+                        GLenum format, GLenum type, const GLvoid *pixels,
+                        bool dsa, const char *callerName)
 {
    struct gl_texture_image *texImage;
    GLenum err;
-   const char* suffix = dsa ? "ture" : "";
 
    if (!texObj) {
       /* must be out of memory */
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTex%sSubImage%dD()",
-                  suffix, dimensions);
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s()", callerName);
       return GL_TRUE;
    }
 
    /* check target (proxies not allowed) */
    if (!legal_texsubimage_target(ctx, dimensions, target, dsa)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTex%sSubImage%uD(target=%s)",
-                  suffix, dimensions, _mesa_lookup_enum_by_nr(target));
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(target=%s)",
+                  callerName, _mesa_lookup_enum_by_nr(target));
       return GL_TRUE;
    }
 
    /* level check */
    if (level < 0 || level >= _mesa_max_texture_levels(ctx, target)) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glTex%sSubImage%uD(level=%d)",
-                  suffix, dimensions, level);
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(level=%d)", callerName, level);
       return GL_TRUE;
    }
 
@@ -2489,9 +2499,8 @@ texsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
    if (_mesa_is_gles(ctx) && !_mesa_is_gles3(ctx)) {
       err = _mesa_es_error_check_format_and_type(format, type, dimensions);
       if (err != GL_NO_ERROR) {
-         _mesa_error(ctx, err,
-                     "glTex%sSubImage%dD(format = %s, type = %s)",
-                     suffix, dimensions, _mesa_lookup_enum_by_nr(format),
+         _mesa_error(ctx, err, "%s(format = %s, type = %s)",
+                     callerName, _mesa_lookup_enum_by_nr(format),
                      _mesa_lookup_enum_by_nr(type));
          return GL_TRUE;
       }
@@ -2500,34 +2509,37 @@ texsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
    err = _mesa_error_check_format_and_type(ctx, format, type);
    if (err != GL_NO_ERROR) {
       _mesa_error(ctx, err,
-                  "glTex%sSubImage%dD(incompatible format = %s, type = %s)",
-                  suffix, dimensions, _mesa_lookup_enum_by_nr(format),
+                  "%s(incompatible format = %s, type = %s)",
+                  callerName, _mesa_lookup_enum_by_nr(format),
                   _mesa_lookup_enum_by_nr(type));
       return GL_TRUE;
    }
 
+   /* validate the bound PBO, if any */
+   if (!_mesa_validate_pbo_source(ctx, dimensions, &ctx->Unpack,
+                                  width, height, depth, format, type,
+                                  INT_MAX, pixels, callerName)) {
+      return GL_TRUE;
+   }
+
    texImage = _mesa_select_tex_image(texObj, target, level);
    if (!texImage) {
       /* non-existant texture level */
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glTex%sSubImage%dD(invalid texture image)", suffix,
-                  dimensions);
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(invalid texture image)",
+                  callerName);
       return GL_TRUE;
    }
 
    if (error_check_subtexture_dimensions(ctx, dimensions,
                                          texImage, xoffset, yoffset, zoffset,
-                                         width, height, depth,
-                                         dsa ? "glTextureSubImage" :
-                                         "glTexSubImage")) {
+                                         width, height, depth, callerName)) {
       return GL_TRUE;
    }
 
    if (_mesa_is_format_compressed(texImage->TexFormat)) {
       if (compressedteximage_only_format(ctx, texImage->InternalFormat)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-               "glTex%sSubImage%dD(no compression for format)",
-               suffix, dimensions);
+               "%s(no compression for format)", callerName);
          return GL_TRUE;
       }
    }
@@ -2537,8 +2549,7 @@ texsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
       if (_mesa_is_format_integer_color(texImage->TexFormat) !=
           _mesa_is_enum_format_integer(format)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTex%sSubImage%dD(integer/non-integer format mismatch)",
-                     suffix, dimensions);
+                     "%s(integer/non-integer format mismatch)", callerName);
          return GL_TRUE;
       }
    }
@@ -2815,10 +2826,9 @@ copytexsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
                             const struct gl_texture_object *texObj,
                             GLenum target, GLint level,
                             GLint xoffset, GLint yoffset, GLint zoffset,
-                            GLint width, GLint height, bool dsa)
+                            GLint width, GLint height, const char *caller)
 {
    struct gl_texture_image *texImage;
-   const char *suffix = dsa ? "ture" : "";
 
    /* Check that the source buffer is complete */
    if (_mesa_is_user_fbo(ctx->ReadBuffer)) {
@@ -2827,31 +2837,26 @@ copytexsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
       }
       if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
          _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                     "glCopyTex%sSubImage%dD(invalid readbuffer)",
-                     suffix, dimensions);
+                     "%s(invalid readbuffer)", caller);
          return GL_TRUE;
       }
 
       if (ctx->ReadBuffer->Visual.samples > 0) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                "glCopyTex%sSubImage%dD(multisample FBO)", suffix,
-                dimensions);
+                "%s(multisample FBO)", caller);
          return GL_TRUE;
       }
    }
 
    /* Check level */
    if (level < 0 || level >= _mesa_max_texture_levels(ctx, target)) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyTex%sSubImage%dD(level=%d)", suffix,
-                  dimensions, level);
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(level=%d)", caller, level);
       return GL_TRUE;
    }
 
    /* Get dest image pointers */
    if (!texObj) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTex%sSubImage%dD()",
-                  suffix, dimensions);
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s()", caller);
       return GL_TRUE;
    }
 
@@ -2859,37 +2864,33 @@ copytexsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
    if (!texImage) {
       /* destination image does not exist */
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCopyTex%sSubImage%dD(invalid texture image)",
-                  suffix, dimensions);
+                  "%s(invalid texture image)", caller);
       return GL_TRUE;
    }
 
    if (error_check_subtexture_dimensions(ctx, dimensions, texImage,
                                          xoffset, yoffset, zoffset,
-                                         width, height, 1, dsa ?
-                                         "glCompressedTextureSubImage" :
-                                         "glCompressedTexSubImage")) {
+                                         width, height, 1, caller)) {
       return GL_TRUE;
    }
 
    if (_mesa_is_format_compressed(texImage->TexFormat)) {
       if (compressedteximage_only_format(ctx, texImage->InternalFormat)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-               "glCopyTex%sSubImage%dD(no compression for format)",
-               suffix, dimensions);
+               "%s(no compression for format)", caller);
          return GL_TRUE;
       }
    }
 
    if (texImage->InternalFormat == GL_YCBCR_MESA) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glCopyTex%sSubImage2D", suffix);
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s()", caller);
       return GL_TRUE;
    }
 
    if (!_mesa_source_buffer_exists(ctx, texImage->_BaseFormat)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCopyTex%sSubImage%dD(missing readbuffer, format=0x%x)",
-                  suffix, dimensions, texImage->_BaseFormat);
+                  "%s(missing readbuffer, format=0x%x)", caller,
+                  texImage->_BaseFormat);
       return GL_TRUE;
    }
 
@@ -2907,8 +2908,7 @@ copytexsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
       if (_mesa_is_format_integer_color(rb->Format) !=
           _mesa_is_format_integer_color(texImage->TexFormat)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTex%sSubImage%dD(integer vs non-integer)",
-                     suffix, dimensions);
+                     "%s(integer vs non-integer)", caller);
          return GL_TRUE;
       }
    }
@@ -3218,12 +3218,13 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
       if (compressed_texture_error_check(ctx, dims, target, level,
                                          internalFormat,
                                          width, height, depth,
-                                         border, imageSize))
+                                         border, imageSize, pixels))
          return;
    }
    else {
       if (texture_error_check(ctx, dims, target, level, internalFormat,
-                              format, type, width, height, depth, border))
+                              format, type, width, height, depth, border,
+                              pixels))
          return;
    }
 
@@ -3562,7 +3563,8 @@ static void
 texsubimage(struct gl_context *ctx, GLuint dims, GLenum target, GLint level,
             GLint xoffset, GLint yoffset, GLint zoffset,
             GLsizei width, GLsizei height, GLsizei depth,
-            GLenum format, GLenum type, const GLvoid *pixels)
+            GLenum format, GLenum type, const GLvoid *pixels,
+            const char *callerName)
 {
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
@@ -3573,7 +3575,8 @@ texsubimage(struct gl_context *ctx, GLuint dims, GLenum target, GLint level,
 
    if (texsubimage_error_check(ctx, dims, texObj, target, level,
                                xoffset, yoffset, zoffset,
-                               width, height, depth, format, type, false)) {
+                               width, height, depth, format, type,
+                               pixels, false, callerName)) {
       return;   /* error was detected */
    }
 
@@ -3603,7 +3606,8 @@ texturesubimage(struct gl_context *ctx, GLuint dims,
                 GLuint texture, GLint level,
                 GLint xoffset, GLint yoffset, GLint zoffset,
                 GLsizei width, GLsizei height, GLsizei depth,
-                GLenum format, GLenum type, const GLvoid *pixels)
+                GLenum format, GLenum type, const GLvoid *pixels,
+                const char *callerName)
 {
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
@@ -3627,7 +3631,8 @@ texturesubimage(struct gl_context *ctx, GLuint dims,
 
    if (texsubimage_error_check(ctx, dims, texObj, texObj->Target, level,
                                xoffset, yoffset, zoffset,
-                               width, height, depth, format, type, true)) {
+                               width, height, depth, format, type,
+                               pixels, true, callerName)) {
       return;   /* error was detected */
    }
 
@@ -3636,20 +3641,6 @@ texturesubimage(struct gl_context *ctx, GLuint dims,
    if (texObj->Target == GL_TEXTURE_CUBE_MAP) {
       GLint rowStride;
 
-      /* Error checking */
-      if (texObj->NumLayers < 6) {
-         /* Not enough image planes for a cube map.  The spec does not say
-          * what should happen in this case because the user has always
-          * specified each cube face separately (using
-          * GL_TEXTURE_CUBE_MAP_POSITIVE_X+i) in previous GL versions.
-          * This is addressed in Khronos Bug 13223.
-          */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTextureSubImage%uD(insufficient cube map storage)",
-                     dims);
-         return;
-      }
-
       /*
        * What do we do if the user created a texture with the following code
        * and then called this function with its handle?
@@ -3691,6 +3682,8 @@ texturesubimage(struct gl_context *ctx, GLuint dims,
       /* Copy in each face. */
       for (i = 0; i < 6; ++i) {
          texImage = texObj->Image[i][level];
+         assert(texImage);
+
          _mesa_texture_sub_image(ctx, 3, texObj, texImage, texObj->Target,
                                  level, xoffset, yoffset, zoffset,
                                  width, height, 1, format,
@@ -3700,8 +3693,7 @@ texturesubimage(struct gl_context *ctx, GLuint dims,
    }
    else {
       texImage = _mesa_select_tex_image(texObj, texObj->Target, level);
-      if (!texImage)
-         return;
+      assert(texImage);
 
       _mesa_texture_sub_image(ctx, dims, texObj, texImage, texObj->Target,
                               level, xoffset, yoffset, zoffset,
@@ -3721,7 +3713,7 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
    texsubimage(ctx, 1, target, level,
                xoffset, 0, 0,
                width, 1, 1,
-               format, type, pixels);
+               format, type, pixels, "glTexSubImage1D");
 }
 
 
@@ -3736,7 +3728,7 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
    texsubimage(ctx, 2, target, level,
                xoffset, yoffset, 0,
                width, height, 1,
-               format, type, pixels);
+               format, type, pixels, "glTexSubImage2D");
 }
 
 
@@ -3752,7 +3744,7 @@ _mesa_TexSubImage3D( GLenum target, GLint level,
    texsubimage(ctx, 3, target, level,
                xoffset, yoffset, zoffset,
                width, height, depth,
-               format, type, pixels);
+               format, type, pixels, "glTexSubImage3D");
 }
 
 void GLAPIENTRY
@@ -3765,7 +3757,7 @@ _mesa_TextureSubImage1D(GLuint texture, GLint level,
    texturesubimage(ctx, 1, texture, level,
                    xoffset, 0, 0,
                    width, 1, 1,
-                   format, type, pixels);
+                   format, type, pixels, "glTextureSubImage1D");
 }
 
 
@@ -3780,7 +3772,7 @@ _mesa_TextureSubImage2D(GLuint texture, GLint level,
    texturesubimage(ctx, 2, texture, level,
                    xoffset, yoffset, 0,
                    width, height, 1,
-                   format, type, pixels);
+                   format, type, pixels, "glTextureSubImage2D");
 }
 
 
@@ -3795,7 +3787,7 @@ _mesa_TextureSubImage3D(GLuint texture, GLint level,
    texturesubimage(ctx, 3, texture, level,
                    xoffset, yoffset, zoffset,
                    width, height, depth,
-                   format, type, pixels);
+                   format, type, pixels, "glTextureSubImage3D");
 }
 
 
@@ -4040,15 +4032,14 @@ _mesa_copy_texture_sub_image(struct gl_context *ctx, GLuint dims,
                              GLint xoffset, GLint yoffset, GLint zoffset,
                              GLint x, GLint y,
                              GLsizei width, GLsizei height,
-                             bool dsa)
+                             const char *caller)
 {
    struct gl_texture_image *texImage;
 
    FLUSH_VERTICES(ctx, 0);
 
    if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glCopyTex%sSubImage%uD %s %d %d %d %d %d %d %d %d\n",
-                  dsa ? "ture" : "", dims,
+      _mesa_debug(ctx, "%s %s %d %d %d %d %d %d %d %d\n", caller,
                   _mesa_lookup_enum_by_nr(target),
                   level, xoffset, yoffset, zoffset, x, y, width, height);
 
@@ -4057,7 +4048,7 @@ _mesa_copy_texture_sub_image(struct gl_context *ctx, GLuint dims,
 
    if (copytexsubimage_error_check(ctx, dims, texObj, target, level,
                                    xoffset, yoffset, zoffset,
-                                   width, height, dsa)) {
+                                   width, height, caller)) {
       return;
    }
 
@@ -4103,14 +4094,14 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
                          GLint xoffset, GLint x, GLint y, GLsizei width )
 {
    struct gl_texture_object* texObj;
+   const char *self = "glCopyTexSubImage1D";
    GET_CURRENT_CONTEXT(ctx);
 
    /* Check target (proxies not allowed). Target must be checked prior to
     * calling _mesa_get_current_tex_object.
     */
    if (!legal_texsubimage_target(ctx, 1, target, false)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glCopyTexSubImage1D(invalid target %s)",
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid target %s)", self,
                   _mesa_lookup_enum_by_nr(target));
       return;
    }
@@ -4120,7 +4111,7 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
       return;
 
    _mesa_copy_texture_sub_image(ctx, 1, texObj, target, level, xoffset, 0, 0,
-                                x, y, width, 1, false);
+                                x, y, width, 1, self);
 }
 
 
@@ -4131,14 +4122,14 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
                          GLint x, GLint y, GLsizei width, GLsizei height )
 {
    struct gl_texture_object* texObj;
+   const char *self = "glCopyTexSubImage2D";
    GET_CURRENT_CONTEXT(ctx);
 
    /* Check target (proxies not allowed). Target must be checked prior to
     * calling _mesa_get_current_tex_object.
     */
    if (!legal_texsubimage_target(ctx, 2, target, false)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glCopyTexSubImage2D(invalid target %s)",
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid target %s)", self,
                   _mesa_lookup_enum_by_nr(target));
       return;
    }
@@ -4149,7 +4140,7 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
 
    _mesa_copy_texture_sub_image(ctx, 2, texObj, target, level,
                                 xoffset, yoffset, 0,
-                                x, y, width, height, false);
+                                x, y, width, height, self);
 }
 
 
@@ -4160,14 +4151,14 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
                          GLint x, GLint y, GLsizei width, GLsizei height )
 {
    struct gl_texture_object* texObj;
+   const char *self = "glCopyTexSubImage3D";
    GET_CURRENT_CONTEXT(ctx);
 
    /* Check target (proxies not allowed). Target must be checked prior to
     * calling _mesa_get_current_tex_object.
     */
    if (!legal_texsubimage_target(ctx, 3, target, false)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glCopyTexSubImage3D(invalid target %s)",
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid target %s)", self,
                   _mesa_lookup_enum_by_nr(target));
       return;
    }
@@ -4178,7 +4169,7 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
 
    _mesa_copy_texture_sub_image(ctx, 3, texObj, target, level,
                                 xoffset, yoffset, zoffset,
-                                x, y, width, height, false);
+                                x, y, width, height, self);
 }
 
 void GLAPIENTRY
@@ -4186,22 +4177,22 @@ _mesa_CopyTextureSubImage1D(GLuint texture, GLint level,
                             GLint xoffset, GLint x, GLint y, GLsizei width)
 {
    struct gl_texture_object* texObj;
+   const char *self = "glCopyTextureSubImage1D";
    GET_CURRENT_CONTEXT(ctx);
 
-   texObj = _mesa_lookup_texture_err(ctx, texture, "glCopyTextureSubImage1D");
+   texObj = _mesa_lookup_texture_err(ctx, texture, self);
    if (!texObj)
       return;
 
    /* Check target (proxies not allowed). */
    if (!legal_texsubimage_target(ctx, 1, texObj->Target, true)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glCopyTextureSubImage1D(invalid target %s)",
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid target %s)", self,
                   _mesa_lookup_enum_by_nr(texObj->Target));
       return;
    }
 
    _mesa_copy_texture_sub_image(ctx, 1, texObj, texObj->Target, level,
-                                xoffset, 0, 0, x, y, width, 1, true);
+                                xoffset, 0, 0, x, y, width, 1, self);
 }
 
 void GLAPIENTRY
@@ -4210,23 +4201,23 @@ _mesa_CopyTextureSubImage2D(GLuint texture, GLint level,
                             GLint x, GLint y, GLsizei width, GLsizei height)
 {
    struct gl_texture_object* texObj;
+   const char *self = "glCopyTextureSubImage2D";
    GET_CURRENT_CONTEXT(ctx);
 
-   texObj = _mesa_lookup_texture_err(ctx, texture, "glCopyTextureSubImage2D");
+   texObj = _mesa_lookup_texture_err(ctx, texture, self);
    if (!texObj)
       return;
 
    /* Check target (proxies not allowed). */
    if (!legal_texsubimage_target(ctx, 2, texObj->Target, true)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glCopyTextureSubImage2D(invalid target %s)",
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid target %s)", self,
                   _mesa_lookup_enum_by_nr(texObj->Target));
       return;
    }
 
    _mesa_copy_texture_sub_image(ctx, 2, texObj, texObj->Target, level,
                                 xoffset, yoffset, 0,
-                                x, y, width, height, true);
+                                x, y, width, height, self);
 }
 
 
@@ -4237,23 +4228,31 @@ _mesa_CopyTextureSubImage3D(GLuint texture, GLint level,
                             GLint x, GLint y, GLsizei width, GLsizei height)
 {
    struct gl_texture_object* texObj;
+   const char *self = "glCopyTextureSubImage3D";
    GET_CURRENT_CONTEXT(ctx);
 
-   texObj = _mesa_lookup_texture_err(ctx, texture, "glCopyTextureSubImage3D");
+   texObj = _mesa_lookup_texture_err(ctx, texture, self);
    if (!texObj)
       return;
 
    /* Check target (proxies not allowed). */
    if (!legal_texsubimage_target(ctx, 3, texObj->Target, true)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glCopyTextureSubImage3D(invalid target %s)",
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid target %s)", self,
                   _mesa_lookup_enum_by_nr(texObj->Target));
       return;
    }
 
-   _mesa_copy_texture_sub_image(ctx, 3, texObj, texObj->Target, level,
-                                xoffset, yoffset, zoffset,
-                                x, y, width, height, true);
+   if (texObj->Target == GL_TEXTURE_CUBE_MAP) {
+      /* Act like CopyTexSubImage2D */
+      _mesa_copy_texture_sub_image(ctx, 2, texObj,
+                                   GL_TEXTURE_CUBE_MAP_POSITIVE_X + zoffset,
+                                   level, xoffset, yoffset, 0,
+                                   x, y, width, height, self);
+   }
+   else
+      _mesa_copy_texture_sub_image(ctx, 3, texObj, texObj->Target, level,
+                                   xoffset, yoffset, zoffset,
+                                   x, y, width, height, self);
 }
 
 static bool
@@ -4636,68 +4635,72 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims,
                                   GLenum target, GLint level,
                                   GLint xoffset, GLint yoffset, GLint zoffset,
                                   GLsizei width, GLsizei height, GLsizei depth,
-                                  GLenum format, GLsizei imageSize, bool dsa)
+                                  GLenum format, GLsizei imageSize,
+                                  const GLvoid *data, const char *callerName)
 {
    struct gl_texture_image *texImage;
    GLint expectedSize;
-   const char *suffix = dsa ? "ture" : "";
 
    /* this will catch any invalid compressed format token */
    if (!_mesa_is_compressed_format(ctx, format)) {
       _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glCompressedTex%sSubImage%uD(format)", suffix, dims);
+                  "%s(format)", callerName);
       return GL_TRUE;
    }
 
    if (level < 0 || level >= _mesa_max_texture_levels(ctx, target)) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCompressedTex%sSubImage%uD(level=%d)",
-                  suffix, dims, level);
+                  "%s(level=%d)",
+                  callerName, level);
+      return GL_TRUE;
+   }
+
+   /* validate the bound PBO, if any */
+   if (!_mesa_validate_pbo_source_compressed(ctx, dims, &ctx->Unpack,
+                                     imageSize, data, callerName)) {
       return GL_TRUE;
    }
 
    /* Check for invalid pixel storage modes */
    if (!_mesa_compressed_pixel_storage_error_check(ctx, dims,
-               &ctx->Unpack,
-               dsa ? "glCompressedTextureSubImage" :
-               "glCompressedTexSubImage")) {
+                                                   &ctx->Unpack, callerName)) {
       return GL_TRUE;
    }
 
    expectedSize = compressed_tex_size(width, height, depth, format);
    if (expectedSize != imageSize) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCompressedTex%sSubImage%uD(size=%d)",
-                  suffix, dims, imageSize);
+                  "%s(size=%d)",
+                  callerName, imageSize);
       return GL_TRUE;
    }
 
    texImage = _mesa_select_tex_image(texObj, target, level);
    if (!texImage) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCompressedTex%sSubImage%uD(invalid texture image)",
-                  suffix, dims);
+                  "%s(invalid texture image)",
+                  callerName);
       return GL_TRUE;
    }
 
    if ((GLint) format != texImage->InternalFormat) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCompressedTex%sSubImage%uD(format=0x%x)",
-                  suffix, dims, format);
+                  "%s(format=0x%x)",
+                  callerName, format);
       return GL_TRUE;
    }
 
    if (compressedteximage_only_format(ctx, format)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-               "glCompressedTex%sSubImage%uD(format=0x%x cannot be updated)",
-               suffix, dims, format);
+               "%s(format=0x%x cannot be updated)",
+               callerName, format);
       return GL_TRUE;
    }
 
    if (error_check_subtexture_dimensions(ctx, dims,
                                          texImage, xoffset, yoffset, zoffset,
                                          width, height, depth,
-                                         "glCompressedTexSubImage")) {
+                                         callerName)) {
       return GL_TRUE;
    }
 
@@ -4748,30 +4751,19 @@ _mesa_CompressedTexImage3D(GLenum target, GLint level,
 void
 _mesa_compressed_texture_sub_image(struct gl_context *ctx, GLuint dims,
                                    struct gl_texture_object *texObj,
+                                   struct gl_texture_image *texImage,
                                    GLenum target, GLint level,
                                    GLint xoffset, GLint yoffset,
                                    GLint zoffset,
                                    GLsizei width, GLsizei height,
                                    GLsizei depth,
                                    GLenum format, GLsizei imageSize,
-                                   const GLvoid *data, bool dsa)
+                                   const GLvoid *data)
 {
-   struct gl_texture_image *texImage;
-
-   if (compressed_subtexture_error_check(ctx, dims, texObj, target,
-                                         level, xoffset, yoffset, zoffset,
-                                         width, height, depth,
-                                         format, imageSize, dsa)) {
-      return;
-   }
-
    FLUSH_VERTICES(ctx, 0);
 
    _mesa_lock_texture(ctx, texObj);
    {
-      texImage = _mesa_select_tex_image(texObj, target, level);
-      assert(texImage);
-
       if (width > 0 && height > 0 && depth > 0) {
          ctx->Driver.CompressedTexSubImage(ctx, dims, texImage,
                                            xoffset, yoffset, zoffset,
@@ -4795,6 +4787,8 @@ _mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset,
                               GLsizei imageSize, const GLvoid *data)
 {
    struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
    GET_CURRENT_CONTEXT(ctx);
 
    if (compressed_subtexture_target_check(ctx, target, 1, format, false,
@@ -4806,9 +4800,20 @@ _mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset,
    if (!texObj)
       return;
 
-   _mesa_compressed_texture_sub_image(ctx, 1, texObj, target, level,
+   if (compressed_subtexture_error_check(ctx, 1, texObj, target,
+                                         level, xoffset, 0, 0,
+                                         width, 1, 1,
+                                         format, imageSize, data,
+                                         "glCompressedTexSubImage1D")) {
+      return;
+   }
+
+   texImage = _mesa_select_tex_image(texObj, target, level);
+   assert(texImage);
+
+   _mesa_compressed_texture_sub_image(ctx, 1, texObj, texImage, target, level,
                                       xoffset, 0, 0, width, 1, 1,
-                                      format, imageSize, data, false);
+                                      format, imageSize, data);
 }
 
 void GLAPIENTRY
@@ -4817,6 +4822,8 @@ _mesa_CompressedTextureSubImage1D(GLuint texture, GLint level, GLint xoffset,
                                   GLsizei imageSize, const GLvoid *data)
 {
    struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
    GET_CURRENT_CONTEXT(ctx);
 
    texObj = _mesa_lookup_texture_err(ctx, texture,
@@ -4830,9 +4837,21 @@ _mesa_CompressedTextureSubImage1D(GLuint texture, GLint level, GLint xoffset,
       return;
    }
 
-   _mesa_compressed_texture_sub_image(ctx, 1, texObj, texObj->Target, level,
+   if (compressed_subtexture_error_check(ctx, 1, texObj, texObj->Target,
+                                         level, xoffset, 0, 0,
+                                         width, 1, 1,
+                                         format, imageSize, data,
+                                         "glCompressedTextureSubImage1D")) {
+      return;
+   }
+
+   texImage = _mesa_select_tex_image(texObj, texObj->Target, level);
+   assert(texImage);
+
+   _mesa_compressed_texture_sub_image(ctx, 1, texObj, texImage,
+                                      texObj->Target, level,
                                       xoffset, 0, 0, width, 1, 1,
-                                      format, imageSize, data, true);
+                                      format, imageSize, data);
 }
 
 
@@ -4843,6 +4862,8 @@ _mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
                               const GLvoid *data)
 {
    struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
    GET_CURRENT_CONTEXT(ctx);
 
    if (compressed_subtexture_target_check(ctx, target, 2, format, false,
@@ -4854,9 +4875,21 @@ _mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
    if (!texObj)
       return;
 
-   _mesa_compressed_texture_sub_image(ctx, 2, texObj, target, level,
+   if (compressed_subtexture_error_check(ctx, 2, texObj, target,
+                                         level, xoffset, yoffset, 0,
+                                         width, height, 1,
+                                         format, imageSize, data,
+                                         "glCompressedTexSubImage2D")) {
+      return;
+   }
+
+
+   texImage = _mesa_select_tex_image(texObj, target, level);
+   assert(texImage);
+
+   _mesa_compressed_texture_sub_image(ctx, 2, texObj, texImage, target, level,
                                       xoffset, yoffset, 0, width, height, 1,
-                                      format, imageSize, data, false);
+                                      format, imageSize, data);
 }
 
 void GLAPIENTRY
@@ -4867,6 +4900,8 @@ _mesa_CompressedTextureSubImage2D(GLuint texture, GLint level, GLint xoffset,
                                   const GLvoid *data)
 {
    struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
    GET_CURRENT_CONTEXT(ctx);
 
    texObj = _mesa_lookup_texture_err(ctx, texture,
@@ -4880,9 +4915,21 @@ _mesa_CompressedTextureSubImage2D(GLuint texture, GLint level, GLint xoffset,
       return;
    }
 
-   _mesa_compressed_texture_sub_image(ctx, 2, texObj, texObj->Target, level,
+   if (compressed_subtexture_error_check(ctx, 2, texObj, texObj->Target,
+                                         level, xoffset, yoffset, 0,
+                                         width, height, 1,
+                                         format, imageSize, data,
+                                         "glCompressedTextureSubImage2D")) {
+      return;
+   }
+
+   texImage = _mesa_select_tex_image(texObj, texObj->Target, level);
+   assert(texImage);
+
+   _mesa_compressed_texture_sub_image(ctx, 2, texObj, texImage,
+                                      texObj->Target, level,
                                       xoffset, yoffset, 0, width, height, 1,
-                                      format, imageSize, data, true);
+                                      format, imageSize, data);
 }
 
 void GLAPIENTRY
@@ -4892,6 +4939,8 @@ _mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset,
                               GLsizei imageSize, const GLvoid *data)
 {
    struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
    GET_CURRENT_CONTEXT(ctx);
 
    if (compressed_subtexture_target_check(ctx, target, 3, format, false,
@@ -4903,10 +4952,22 @@ _mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset,
    if (!texObj)
       return;
 
-   _mesa_compressed_texture_sub_image(ctx, 3, texObj, target, level,
+   if (compressed_subtexture_error_check(ctx, 3, texObj, target,
+                                         level, xoffset, yoffset, zoffset,
+                                         width, height, depth,
+                                         format, imageSize, data,
+                                         "glCompressedTexSubImage3D")) {
+      return;
+   }
+
+
+   texImage = _mesa_select_tex_image(texObj, target, level);
+   assert(texImage);
+
+   _mesa_compressed_texture_sub_image(ctx, 3, texObj, texImage, target, level,
                                       xoffset, yoffset, zoffset,
                                       width, height, depth,
-                                      format, imageSize, data, false);
+                                      format, imageSize, data);
 }
 
 void GLAPIENTRY
@@ -4917,6 +4978,8 @@ _mesa_CompressedTextureSubImage3D(GLuint texture, GLint level, GLint xoffset,
                                   const GLvoid *data)
 {
    struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
    GET_CURRENT_CONTEXT(ctx);
 
    texObj = _mesa_lookup_texture_err(ctx, texture,
@@ -4930,10 +4993,60 @@ _mesa_CompressedTextureSubImage3D(GLuint texture, GLint level, GLint xoffset,
       return;
    }
 
-   _mesa_compressed_texture_sub_image(ctx, 3, texObj, texObj->Target, level,
-                                      xoffset, yoffset, zoffset,
-                                      width, height, depth,
-                                      format, imageSize, data, true);
+   if (compressed_subtexture_error_check(ctx, 3, texObj, texObj->Target,
+                                         level, xoffset, yoffset, zoffset,
+                                         width, height, depth,
+                                         format, imageSize, data,
+                                         "glCompressedTextureSubImage3D")) {
+      return;
+   }
+
+   /* Must handle special case GL_TEXTURE_CUBE_MAP. */
+   if (texObj->Target == GL_TEXTURE_CUBE_MAP) {
+      const char *pixels = data;
+      int i;
+      GLint image_stride;
+
+      /* Make sure the texture object is a proper cube.
+       * (See texturesubimage in teximage.c for details on why this check is
+       * performed.)
+       */
+      if (!_mesa_cube_level_complete(texObj, level)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glCompressedTextureSubImage3D(cube map incomplete)");
+         return;
+      }
+
+      /* Copy in each face. */
+      for (i = 0; i < 6; ++i) {
+         texImage = texObj->Image[i][level];
+         assert(texImage);
+
+         _mesa_compressed_texture_sub_image(ctx, 3, texObj, texImage,
+                                            texObj->Target, level,
+                                            xoffset, yoffset, zoffset,
+                                            width, height, 1,
+                                            format, imageSize, pixels);
+
+         /* Compressed images don't have a client format */
+         image_stride = _mesa_format_image_size(texImage->TexFormat,
+                                                texImage->Width,
+                                                texImage->Height, 1);
+
+         pixels += image_stride;
+         imageSize -= image_stride;
+      }
+   }
+   else {
+      texImage = _mesa_select_tex_image(texObj, texObj->Target, level);
+      assert(texImage);
+
+      _mesa_compressed_texture_sub_image(ctx, 3, texObj, texImage,
+                                         texObj->Target, level,
+                                         xoffset, yoffset, zoffset,
+                                         width, height, depth,
+                                         format, imageSize, data);
+   }
 }
 
 static mesa_format
@@ -5152,24 +5265,34 @@ _mesa_validate_texbuffer_format(const struct gl_context *ctx,
 
 void
 _mesa_texture_buffer_range(struct gl_context *ctx,
-                           struct gl_texture_object *texObj, GLenum target,
+                           struct gl_texture_object *texObj,
                            GLenum internalFormat,
                            struct gl_buffer_object *bufObj,
-                           GLintptr offset, GLsizeiptr size, bool range,
-                           bool dsa)
+                           GLintptr offset, GLsizeiptr size,
+                           const char *caller)
 {
    mesa_format format;
 
-   FLUSH_VERTICES(ctx, 0);
+   /* NOTE: ARB_texture_buffer_object has interactions with
+    * the compatibility profile that are not implemented.
+    */
+   if (!(ctx->API == API_OPENGL_CORE &&
+         ctx->Extensions.ARB_texture_buffer_object)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "%s(ARB_texture_buffer_object is not"
+                  " implemented for the compatibility profile)", caller);
+      return;
+   }
 
    format = _mesa_validate_texbuffer_format(ctx, internalFormat);
    if (format == MESA_FORMAT_NONE) {
       _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glTex%sBuffer%s(internalFormat 0x%x)", dsa ? "ture" : "",
-                  range ? "Range" : "", internalFormat);
+                  "%s(internalFormat 0x%x)", caller, internalFormat);
       return;
    }
 
+   FLUSH_VERTICES(ctx, 0);
+
    _mesa_lock_texture(ctx, texObj);
    {
       _mesa_reference_buffer_object(ctx, &texObj->BufferObject, bufObj);
@@ -5188,6 +5311,75 @@ _mesa_texture_buffer_range(struct gl_context *ctx,
 }
 
 
+/**
+ * Make sure the texture buffer target is GL_TEXTURE_BUFFER.
+ * Return true if it is, and return false if it is not
+ * (and throw INVALID ENUM as dictated in the OpenGL 4.5
+ * core spec, 02.02.2015, PDF page 245).
+ */
+static bool
+check_texture_buffer_target(struct gl_context *ctx, GLenum target,
+                            const char *caller)
+{
+   if (target != GL_TEXTURE_BUFFER_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "%s(texture target is not GL_TEXTURE_BUFFER)", caller);
+      return false;
+   }
+   else
+      return true;
+}
+
+/**
+ * Check for errors related to the texture buffer range.
+ * Return false if errors are found, true if none are found.
+ */
+static bool
+check_texture_buffer_range(struct gl_context *ctx,
+                           struct gl_buffer_object *bufObj,
+                           GLintptr offset, GLsizeiptr size,
+                           const char *caller)
+{
+   /* OpenGL 4.5 core spec (02.02.2015) says in Section 8.9 Buffer
+    * Textures (PDF page 245):
+    *    "An INVALID_VALUE error is generated if offset is negative, if
+    *    size is less than or equal to zero, or if offset + size is greater
+    *    than the value of BUFFER_SIZE for the buffer bound to target."
+    */
+   if (offset < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(offset=%d < 0)", caller,
+                  (int) offset);
+      return false;
+   }
+
+   if (size <= 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(size=%d <= 0)", caller,
+                  (int) size);
+      return false;
+   }
+
+   if (offset + size > bufObj->Size) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "%s(offset=%d + size=%d > buffer_size=%d)", caller,
+                  (int) offset, (int) size, (int) bufObj->Size);
+      return false;
+   }
+
+   /* OpenGL 4.5 core spec (02.02.2015) says in Section 8.9 Buffer
+    * Textures (PDF page 245):
+    *    "An INVALID_VALUE error is generated if offset is not an integer
+    *    multiple of the value of TEXTURE_BUFFER_OFFSET_ALIGNMENT."
+    */
+   if (offset % ctx->Const.TextureBufferOffsetAlignment) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "%s(invalid offset alignment)", caller);
+      return false;
+   }
+
+   return true;
+}
+
+
 /** GL_ARB_texture_buffer_object */
 void GLAPIENTRY
 _mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
@@ -5197,33 +5389,25 @@ _mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
 
    GET_CURRENT_CONTEXT(ctx);
 
-   /* Need to catch this before it gets to _mesa_get_current_tex_object */
-   if (target != GL_TEXTURE_BUFFER_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexBuffer(target)");
-      return;
-   }
-
-   /* NOTE: ARB_texture_buffer_object has interactions with
-    * the compatibility profile that are not implemented.
+   /* Need to catch a bad target before it gets to
+    * _mesa_get_current_tex_object.
     */
-   if (!(ctx->API == API_OPENGL_CORE &&
-         ctx->Extensions.ARB_texture_buffer_object)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBuffer");
+   if (!check_texture_buffer_target(ctx, target, "glTexBuffer"))
       return;
-   }
 
-   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
-   if (!bufObj && buffer) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBuffer(buffer %u)", buffer);
-      return;
-   }
+   if (buffer) {
+      bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glTexBuffer");
+      if (!bufObj)
+         return;
+   } else
+      bufObj = NULL;
 
    texObj = _mesa_get_current_tex_object(ctx, target);
    if (!texObj)
       return;
 
-   _mesa_texture_buffer_range(ctx, texObj, target, internalFormat, bufObj, 0,
-                              buffer ? -1 : 0, false, false);
+   _mesa_texture_buffer_range(ctx, texObj, internalFormat, bufObj, 0,
+                              buffer ? -1 : 0, "glTexBuffer");
 }
 
 
@@ -5237,46 +5421,41 @@ _mesa_TexBufferRange(GLenum target, GLenum internalFormat, GLuint buffer,
 
    GET_CURRENT_CONTEXT(ctx);
 
-   /* Need to catch this before it gets to _mesa_get_current_tex_object */
-   if (target != GL_TEXTURE_BUFFER_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexBufferRange(target)");
-      return;
-   }
-
-   if (!(ctx->API == API_OPENGL_CORE &&
-         ctx->Extensions.ARB_texture_buffer_range)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBufferRange");
+   /* Need to catch a bad target before it gets to
+    * _mesa_get_current_tex_object.
+    */
+   if (!check_texture_buffer_target(ctx, target, "glTexBufferRange"))
       return;
-   }
 
-   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
-   if (bufObj) {
-      if (offset < 0 ||
-          size <= 0 ||
-          (offset + size) > bufObj->Size) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glTexBufferRange");
+   if (buffer) {
+      bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glTexBufferRange");
+      if (!bufObj)
          return;
-      }
-      if (offset % ctx->Const.TextureBufferOffsetAlignment) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glTexBufferRange(invalid offset alignment)");
+
+      if (!check_texture_buffer_range(ctx, bufObj, offset, size,
+          "glTexBufferRange"))
          return;
-      }
-   } else if (buffer) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBufferRange(buffer %u)",
-                  buffer);
-      return;
+
    } else {
+
+      /* OpenGL 4.5 core spec (02.02.2015) says in Section 8.9 Buffer
+       * Textures (PDF page 254):
+       *    "If buffer is zero, then any buffer object attached to the buffer
+       *    texture is detached, the values offset and size are ignored and
+       *    the state for offset and size for the buffer texture are reset to
+       *    zero."
+       */
       offset = 0;
       size = 0;
+      bufObj = NULL;
    }
 
    texObj = _mesa_get_current_tex_object(ctx, target);
    if (!texObj)
       return;
 
-   _mesa_texture_buffer_range(ctx, texObj, target, internalFormat, bufObj,
-                              offset, size, true, false);
+   _mesa_texture_buffer_range(ctx, texObj, internalFormat, bufObj,
+                              offset, size, "glTexBufferRange");
 }
 
 void GLAPIENTRY
@@ -5287,35 +5466,69 @@ _mesa_TextureBuffer(GLuint texture, GLenum internalFormat, GLuint buffer)
 
    GET_CURRENT_CONTEXT(ctx);
 
-   /* NOTE: ARB_texture_buffer_object has interactions with
-    * the compatibility profile that are not implemented.
-    */
-   if (!(ctx->API == API_OPENGL_CORE &&
-         ctx->Extensions.ARB_texture_buffer_object)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTextureBuffer");
+   if (buffer) {
+      bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glTextureBuffer");
+      if (!bufObj)
+         return;
+   } else
+      bufObj = NULL;
+
+   /* Get the texture object by Name. */
+   texObj = _mesa_lookup_texture_err(ctx, texture, "glTextureBuffer");
+   if (!texObj)
       return;
-   }
 
-   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
-   if (!bufObj && buffer) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTextureBuffer(buffer %u)",
-                  buffer);
+   if (!check_texture_buffer_target(ctx, texObj->Target, "glTextureBuffer"))
       return;
+
+   _mesa_texture_buffer_range(ctx, texObj, internalFormat,
+                              bufObj, 0, buffer ? -1 : 0, "glTextureBuffer");
+}
+
+void GLAPIENTRY
+_mesa_TextureBufferRange(GLuint texture, GLenum internalFormat, GLuint buffer,
+                         GLintptr offset, GLsizeiptr size)
+{
+   struct gl_texture_object *texObj;
+   struct gl_buffer_object *bufObj;
+
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (buffer) {
+      bufObj = _mesa_lookup_bufferobj_err(ctx, buffer,
+                                          "glTextureBufferRange");
+      if (!bufObj)
+         return;
+
+      if (!check_texture_buffer_range(ctx, bufObj, offset, size,
+          "glTextureBufferRange"))
+         return;
+
+   } else {
+
+      /* OpenGL 4.5 core spec (02.02.2015) says in Section 8.9 Buffer
+       * Textures (PDF page 254):
+       *    "If buffer is zero, then any buffer object attached to the buffer
+       *    texture is detached, the values offset and size are ignored and
+       *    the state for offset and size for the buffer texture are reset to
+       *    zero."
+       */
+      offset = 0;
+      size = 0;
+      bufObj = NULL;
    }
 
    /* Get the texture object by Name. */
-   texObj = _mesa_lookup_texture_err(ctx, texture,
-                                     "glTextureBuffer(texture)");
+   texObj = _mesa_lookup_texture_err(ctx, texture, "glTextureBufferRange");
    if (!texObj)
       return;
 
-   if (texObj->Target != GL_TEXTURE_BUFFER_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTextureBuffer(target)");
+   if (!check_texture_buffer_target(ctx, texObj->Target,
+       "glTextureBufferRange"))
       return;
-   }
 
-   _mesa_texture_buffer_range(ctx, texObj, texObj->Target, internalFormat,
-                              bufObj, 0, buffer ? -1 : 0, false, true);
+   _mesa_texture_buffer_range(ctx, texObj, internalFormat,
+                              bufObj, offset, size, "glTextureBufferRange");
 }
 
 static GLboolean
diff --git a/mesalib/src/mesa/main/teximage.h b/mesalib/src/mesa/main/teximage.h
index b7336bc6c..1eebaa8b6 100644
--- a/mesalib/src/mesa/main/teximage.h
+++ b/mesalib/src/mesa/main/teximage.h
@@ -181,13 +181,14 @@ _mesa_texture_sub_image(struct gl_context *ctx, GLuint dims,
 extern void
 _mesa_compressed_texture_sub_image(struct gl_context *ctx, GLuint dims, 
                                    struct gl_texture_object *texObj, 
+                                   struct gl_texture_image *texImage,
                                    GLenum target, GLint level,
                                    GLint xoffset, GLint yoffset,
                                    GLint zoffset,
                                    GLsizei width, GLsizei height,
                                    GLsizei depth,
                                    GLenum format, GLsizei imageSize,
-                                   const GLvoid *data, bool dsa);
+                                   const GLvoid *data);
 
 extern void
 _mesa_copy_texture_sub_image(struct gl_context *ctx, GLuint dims,
@@ -195,7 +196,8 @@ _mesa_copy_texture_sub_image(struct gl_context *ctx, GLuint dims,
                              GLenum target, GLint level,
                              GLint xoffset, GLint yoffset, GLint zoffset,
                              GLint x, GLint y,
-                             GLsizei width, GLsizei height, bool dsa);
+                             GLsizei width, GLsizei height,
+                             const char *caller);
 
 extern void
 _mesa_texture_image_multisample(struct gl_context *ctx, GLuint dims,
@@ -208,11 +210,11 @@ _mesa_texture_image_multisample(struct gl_context *ctx, GLuint dims,
 
 extern void
 _mesa_texture_buffer_range(struct gl_context *ctx,
-                           struct gl_texture_object *texObj, GLenum target, 
+                           struct gl_texture_object *texObj,
                            GLenum internalFormat,
                            struct gl_buffer_object *bufObj,
-                           GLintptr offset, GLsizeiptr size, bool range,
-                           bool dsa);
+                           GLintptr offset, GLsizeiptr size,
+                           const char *caller);
 /*@}*/
 
 
@@ -408,6 +410,10 @@ _mesa_TexBufferRange(GLenum target, GLenum internalFormat, GLuint buffer,
 extern void GLAPIENTRY
 _mesa_TextureBuffer(GLuint texture, GLenum internalFormat, GLuint buffer);
 
+extern void GLAPIENTRY
+_mesa_TextureBufferRange(GLuint texture, GLenum internalFormat, GLuint buffer,
+                         GLintptr offset, GLsizeiptr size);
+
 
 extern void GLAPIENTRY
 _mesa_TexImage2DMultisample(GLenum target, GLsizei samples,
diff --git a/mesalib/src/mesa/main/transformfeedback.c b/mesalib/src/mesa/main/transformfeedback.c
index a3e23ced5..ce678c864 100644
--- a/mesalib/src/mesa/main/transformfeedback.c
+++ b/mesalib/src/mesa/main/transformfeedback.c
@@ -762,7 +762,7 @@ _mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,
 
    /* Save the new names and the count */
    for (i = 0; i < count; i++) {
-      shProg->TransformFeedback.VaryingNames[i] = _mesa_strdup(varyings[i]);
+      shProg->TransformFeedback.VaryingNames[i] = strdup(varyings[i]);
    }
    shProg->TransformFeedback.NumVarying = count;
 
diff --git a/mesalib/src/mesa/main/uniform_query.cpp b/mesalib/src/mesa/main/uniform_query.cpp
index 9f82de952..2ab5528c3 100644
--- a/mesalib/src/mesa/main/uniform_query.cpp
+++ b/mesalib/src/mesa/main/uniform_query.cpp
@@ -260,8 +260,8 @@ validate_uniform_parameters(struct gl_context *ctx,
    if (uni->array_elements == 0) {
       if (count > 1) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "%s(count > 1 for non-array, location=%d)",
-                     caller, location);
+                     "%s(count = %u for non-array \"%s\"@%d)",
+                     caller, count, uni->name, location);
          return NULL;
       }
 
@@ -601,6 +601,46 @@ _mesa_propagate_uniforms_to_driver_storage(struct gl_uniform_storage *uni,
    }
 }
 
+
+/**
+ * Return printable string for a given GLSL_TYPE_x
+ */
+static const char *
+glsl_type_name(enum glsl_base_type type)
+{
+   switch (type) {
+   case GLSL_TYPE_UINT:
+      return "uint";
+   case GLSL_TYPE_INT:
+      return "int";
+   case GLSL_TYPE_FLOAT:
+      return "float";
+   case GLSL_TYPE_DOUBLE:
+      return "double";
+   case GLSL_TYPE_BOOL:
+      return "bool";
+   case GLSL_TYPE_SAMPLER:
+      return "sampler";
+   case GLSL_TYPE_IMAGE:
+      return "image";
+   case GLSL_TYPE_ATOMIC_UINT:
+      return "atomic_uint";
+   case GLSL_TYPE_STRUCT:
+      return "struct";
+   case GLSL_TYPE_INTERFACE:
+      return "interface";
+   case GLSL_TYPE_ARRAY:
+      return "array";
+   case GLSL_TYPE_VOID:
+      return "void";
+   case GLSL_TYPE_ERROR:
+      return "error";
+   default:
+      return "other";
+   }
+}
+
+
 /**
  * Called via glUniform*() functions.
  */
@@ -620,11 +660,28 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg,
    if (uni == NULL)
       return;
 
+   if (uni->type->is_matrix()) {
+      /* Can't set matrix uniforms (like mat4) with glUniform */
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glUniform%u(uniform \"%s\"@%d is matrix)",
+                  src_components, uni->name, location);
+      return;
+   }
+
    /* Verify that the types are compatible.
     */
    const unsigned components = uni->type->is_sampler()
       ? 1 : uni->type->vector_elements;
 
+   if (components != src_components) {
+      /* glUniformN() must match float/vecN type */
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glUniform%u(\"%s\"@%u has %u components, not %u)",
+                  src_components, uni->name, location,
+                  components, src_components);
+      return;
+   }
+
    bool match;
    switch (uni->type->base_type) {
    case GLSL_TYPE_BOOL:
@@ -639,8 +696,12 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg,
       break;
    }
 
-   if (uni->type->is_matrix() || components != src_components || !match) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(type mismatch)");
+   if (!match) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glUniform%u(\"%s\"@%d is %s, not %s)",
+                  src_components, uni->name, location,
+                  glsl_type_name(uni->type->base_type),
+                  glsl_type_name(basicType));
       return;
    }
 
diff --git a/mesalib/src/mesa/math/m_clip_tmp.h b/mesalib/src/mesa/math/m_clip_tmp.h
index 45dec47f0..e289be7b3 100644
--- a/mesalib/src/mesa/math/m_clip_tmp.h
+++ b/mesalib/src/mesa/math/m_clip_tmp.h
@@ -40,7 +40,7 @@
  * \param andMask bitwise-AND of clipMask values
  * \return proj_vec pointer
  */
-static GLvector4f * _XFORMAPI TAG(cliptest_points4)( GLvector4f *clip_vec,
+static GLvector4f * TAG(cliptest_points4)( GLvector4f *clip_vec,
                                                      GLvector4f *proj_vec,
                                                      GLubyte clipMask[],
                                                      GLubyte *orMask,
@@ -120,7 +120,7 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points4)( GLvector4f *clip_vec,
  * \param andMask bitwise-AND of clipMask values
  * \return clip_vec pointer
  */
-static GLvector4f * _XFORMAPI TAG(cliptest_np_points4)( GLvector4f *clip_vec,
+static GLvector4f * TAG(cliptest_np_points4)( GLvector4f *clip_vec,
 							GLvector4f *proj_vec,
 							GLubyte clipMask[],
 							GLubyte *orMask,
@@ -177,7 +177,7 @@ static GLvector4f * _XFORMAPI TAG(cliptest_np_points4)( GLvector4f *clip_vec,
 }
 
 
-static GLvector4f * _XFORMAPI TAG(cliptest_points3)( GLvector4f *clip_vec,
+static GLvector4f * TAG(cliptest_points3)( GLvector4f *clip_vec,
                                                      GLvector4f *proj_vec,
                                                      GLubyte clipMask[],
                                                      GLubyte *orMask,
@@ -213,7 +213,7 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points3)( GLvector4f *clip_vec,
 }
 
 
-static GLvector4f * _XFORMAPI TAG(cliptest_points2)( GLvector4f *clip_vec,
+static GLvector4f * TAG(cliptest_points2)( GLvector4f *clip_vec,
                                                      GLvector4f *proj_vec,
                                                      GLubyte clipMask[],
                                                      GLubyte *orMask,
diff --git a/mesalib/src/mesa/math/m_norm_tmp.h b/mesalib/src/mesa/math/m_norm_tmp.h
index c8fab0ed3..d3ec1c22e 100644
--- a/mesalib/src/mesa/math/m_norm_tmp.h
+++ b/mesalib/src/mesa/math/m_norm_tmp.h
@@ -39,7 +39,7 @@
  *           optimization)
  * dest - the destination vector of normals
  */
-static void _XFORMAPI
+static void
 TAG(transform_normalize_normals)( const GLmatrix *mat,
                                   GLfloat scale,
                                   const GLvector4f *in,
@@ -106,7 +106,7 @@ TAG(transform_normalize_normals)( const GLmatrix *mat,
 }
 
 
-static void _XFORMAPI
+static void
 TAG(transform_normalize_normals_no_rot)( const GLmatrix *mat,
                                          GLfloat scale,
                                          const GLvector4f *in,
@@ -171,7 +171,7 @@ TAG(transform_normalize_normals_no_rot)( const GLmatrix *mat,
 }
 
 
-static void _XFORMAPI
+static void
 TAG(transform_rescale_normals_no_rot)( const GLmatrix *mat,
                                        GLfloat scale,
                                        const GLvector4f *in,
@@ -200,7 +200,7 @@ TAG(transform_rescale_normals_no_rot)( const GLmatrix *mat,
 }
 
 
-static void _XFORMAPI
+static void
 TAG(transform_rescale_normals)( const GLmatrix *mat,
                                 GLfloat scale,
                                 const GLvector4f *in,
@@ -232,7 +232,7 @@ TAG(transform_rescale_normals)( const GLmatrix *mat,
 }
 
 
-static void _XFORMAPI
+static void
 TAG(transform_normals_no_rot)( const GLmatrix *mat,
 			       GLfloat scale,
 			       const GLvector4f *in,
@@ -262,7 +262,7 @@ TAG(transform_normals_no_rot)( const GLmatrix *mat,
 }
 
 
-static void _XFORMAPI
+static void
 TAG(transform_normals)( const GLmatrix *mat,
                         GLfloat scale,
                         const GLvector4f *in,
@@ -292,7 +292,7 @@ TAG(transform_normals)( const GLmatrix *mat,
 }
 
 
-static void _XFORMAPI
+static void
 TAG(normalize_normals)( const GLmatrix *mat,
                         GLfloat scale,
                         const GLvector4f *in,
@@ -338,7 +338,7 @@ TAG(normalize_normals)( const GLmatrix *mat,
 }
 
 
-static void _XFORMAPI
+static void
 TAG(rescale_normals)( const GLmatrix *mat,
                       GLfloat scale,
                       const GLvector4f *in,
@@ -361,7 +361,7 @@ TAG(rescale_normals)( const GLmatrix *mat,
 }
 
 
-static void _XFORMAPI
+static void
 TAG(init_c_norm_transform)( void )
 {
    _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =
diff --git a/mesalib/src/mesa/math/m_xform.h b/mesalib/src/mesa/math/m_xform.h
index 2ed62e711..0bb8e9bd8 100644
--- a/mesalib/src/mesa/math/m_xform.h
+++ b/mesalib/src/mesa/math/m_xform.h
@@ -32,14 +32,6 @@
 #include "math/m_matrix.h"
 #include "math/m_vector.h"
 
-#ifdef USE_X86_ASM
-#define _XFORMAPI _ASMAPI
-#define _XFORMAPIP _ASMAPIP
-#else
-#define _XFORMAPI
-#define _XFORMAPIP *
-#endif
-
 
 extern void
 _math_init_transformation(void);
@@ -99,12 +91,12 @@ init_c_cliptest(void);
 #define CLIP_FRUSTUM_BITS    0x3f
 
 
-typedef GLvector4f * (_XFORMAPIP clip_func)( GLvector4f *vClip,
-					     GLvector4f *vProj,
-					     GLubyte clipMask[],
-					     GLubyte *orMask,
-					     GLubyte *andMask,
-					     GLboolean viewport_z_clip );
+typedef GLvector4f * (*clip_func)(GLvector4f *vClip,
+                                  GLvector4f *vProj,
+                                  GLubyte clipMask[],
+                                  GLubyte *orMask,
+                                  GLubyte *andMask,
+                                  GLboolean viewport_z_clip);
 
 typedef void (*dotprod_func)( GLfloat *out,
 			      GLuint out_stride,
@@ -119,11 +111,11 @@ typedef void (*vec_copy_func)( GLvector4f *to,
 /*
  * Functions for transformation of normals in the VB.
  */
-typedef void (_XFORMAPIP normal_func)( const GLmatrix *mat,
-				      GLfloat scale,
-				      const GLvector4f *in,
-				      const GLfloat lengths[],
-				      GLvector4f *dest );
+typedef void (*normal_func)(const GLmatrix *mat,
+                            GLfloat scale,
+                            const GLvector4f *in,
+                            const GLfloat lengths[],
+                            GLvector4f *dest);
 
 
 /* Flags for selecting a normal transformation function.
@@ -141,9 +133,9 @@ typedef void (_XFORMAPIP normal_func)( const GLmatrix *mat,
  *     when the mask byte is zero.  This is always present as a
  *     parameter, to allow a unified interface.
  */
-typedef void (_XFORMAPIP transform_func)( GLvector4f *to_vec,
-					  const GLfloat m[16],
-					  const GLvector4f *from_vec );
+typedef void (*transform_func)(GLvector4f *to_vec,
+                               const GLfloat m[16],
+                               const GLvector4f *from_vec);
 
 
 extern dotprod_func  _mesa_dotprod_tab[5];
diff --git a/mesalib/src/mesa/math/m_xform_tmp.h b/mesalib/src/mesa/math/m_xform_tmp.h
index 8886c9646..af85de3d4 100644
--- a/mesalib/src/mesa/math/m_xform_tmp.h
+++ b/mesalib/src/mesa/math/m_xform_tmp.h
@@ -70,7 +70,7 @@
  *     driver-specific vertex format.
  */
 
-static void _XFORMAPI
+static void
 TAG(transform_points1_general)( GLvector4f *to_vec,
 				const GLfloat m[16],
 				const GLvector4f *from_vec )
@@ -96,7 +96,7 @@ TAG(transform_points1_general)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points1_identity)( GLvector4f *to_vec,
 				 const GLfloat m[16],
 				 const GLvector4f *from_vec )
@@ -116,7 +116,7 @@ TAG(transform_points1_identity)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points1_2d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
 			   const GLvector4f *from_vec )
@@ -138,7 +138,7 @@ TAG(transform_points1_2d)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points1_2d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
 				  const GLvector4f *from_vec )
@@ -159,7 +159,7 @@ TAG(transform_points1_2d_no_rot)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points1_3d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
 			   const GLvector4f *from_vec )
@@ -183,7 +183,7 @@ TAG(transform_points1_3d)( GLvector4f *to_vec,
 }
 
 
-static void _XFORMAPI
+static void
 TAG(transform_points1_3d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
 				  const GLvector4f *from_vec )
@@ -206,7 +206,7 @@ TAG(transform_points1_3d_no_rot)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points1_perspective)( GLvector4f *to_vec,
 				    const GLfloat m[16],
 				    const GLvector4f *from_vec )
@@ -236,7 +236,7 @@ TAG(transform_points1_perspective)( GLvector4f *to_vec,
  * present early in the geometry pipeline and throughout the
  * texture pipeline.
  */
-static void _XFORMAPI
+static void
 TAG(transform_points2_general)( GLvector4f *to_vec,
 				const GLfloat m[16],
 				const GLvector4f *from_vec )
@@ -262,7 +262,7 @@ TAG(transform_points2_general)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points2_identity)( GLvector4f *to_vec,
 				 const GLfloat m[16],
 				 const GLvector4f *from_vec )
@@ -283,7 +283,7 @@ TAG(transform_points2_identity)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points2_2d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
 			   const GLvector4f *from_vec )
@@ -305,7 +305,7 @@ TAG(transform_points2_2d)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points2_2d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
 				  const GLvector4f *from_vec )
@@ -326,7 +326,7 @@ TAG(transform_points2_2d_no_rot)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points2_3d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
 			   const GLvector4f *from_vec )
@@ -353,7 +353,7 @@ TAG(transform_points2_3d)( GLvector4f *to_vec,
 /* I would actually say this was a fairly important function, from
  * a texture transformation point of view.
  */
-static void _XFORMAPI
+static void
 TAG(transform_points2_3d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
 				  const GLvector4f *from_vec )
@@ -382,7 +382,7 @@ TAG(transform_points2_3d_no_rot)( GLvector4f *to_vec,
 }
 
 
-static void _XFORMAPI
+static void
 TAG(transform_points2_perspective)( GLvector4f *to_vec,
 				    const GLfloat m[16],
 				    const GLvector4f *from_vec )
@@ -407,7 +407,7 @@ TAG(transform_points2_perspective)( GLvector4f *to_vec,
 
 
 
-static void _XFORMAPI
+static void
 TAG(transform_points3_general)( GLvector4f *to_vec,
 				const GLfloat m[16],
 				const GLvector4f *from_vec )
@@ -433,7 +433,7 @@ TAG(transform_points3_general)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points3_identity)( GLvector4f *to_vec,
 				 const GLfloat m[16],
 				 const GLvector4f *from_vec )
@@ -455,7 +455,7 @@ TAG(transform_points3_identity)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points3_2d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
 			   const GLvector4f *from_vec )
@@ -478,7 +478,7 @@ TAG(transform_points3_2d)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points3_2d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
 				  const GLvector4f *from_vec )
@@ -500,7 +500,7 @@ TAG(transform_points3_2d_no_rot)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points3_3d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
 			   const GLvector4f *from_vec )
@@ -526,7 +526,7 @@ TAG(transform_points3_3d)( GLvector4f *to_vec,
 
 /* previously known as ortho...
  */
-static void _XFORMAPI
+static void
 TAG(transform_points3_3d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
 				  const GLvector4f *from_vec )
@@ -549,7 +549,7 @@ TAG(transform_points3_3d_no_rot)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points3_perspective)( GLvector4f *to_vec,
 				    const GLfloat m[16],
 				    const GLvector4f *from_vec )
@@ -575,7 +575,7 @@ TAG(transform_points3_perspective)( GLvector4f *to_vec,
 
 
 
-static void _XFORMAPI
+static void
 TAG(transform_points4_general)( GLvector4f *to_vec,
 				const GLfloat m[16],
 				const GLvector4f *from_vec )
@@ -601,7 +601,7 @@ TAG(transform_points4_general)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points4_identity)( GLvector4f *to_vec,
 				 const GLfloat m[16],
 				 const GLvector4f *from_vec )
@@ -624,7 +624,7 @@ TAG(transform_points4_identity)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points4_2d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
 			   const GLvector4f *from_vec )
@@ -648,7 +648,7 @@ TAG(transform_points4_2d)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points4_2d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
 				  const GLvector4f *from_vec )
@@ -671,7 +671,7 @@ TAG(transform_points4_2d_no_rot)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points4_3d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
 			   const GLvector4f *from_vec )
@@ -696,7 +696,7 @@ TAG(transform_points4_3d)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points4_3d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
 				  const GLvector4f *from_vec )
@@ -720,7 +720,7 @@ TAG(transform_points4_3d_no_rot)( GLvector4f *to_vec,
    to_vec->count = from_vec->count;
 }
 
-static void _XFORMAPI
+static void
 TAG(transform_points4_perspective)( GLvector4f *to_vec,
 				    const GLfloat m[16],
 				    const GLvector4f *from_vec )
@@ -753,7 +753,7 @@ static transform_func TAG(transform_tab_4)[7];
  * optimized routines overwriting the arrays.  This only occurs during
  * startup.
  */
-static void _XFORMAPI TAG(init_c_transformations)( void )
+static void TAG(init_c_transformations)( void )
 {
 #define TAG_TAB   _mesa_transform_tab
 #define TAG_TAB_1 TAG(transform_tab_1)
diff --git a/mesalib/src/mesa/program/prog_instruction.c b/mesalib/src/mesa/program/prog_instruction.c
index 6a9bcb7b5..f9ebe4e8f 100644
--- a/mesalib/src/mesa/program/prog_instruction.c
+++ b/mesalib/src/mesa/program/prog_instruction.c
@@ -89,7 +89,7 @@ _mesa_copy_instructions(struct prog_instruction *dest,
    memcpy(dest, src, n * sizeof(struct prog_instruction));
    for (i = 0; i < n; i++) {
       if (src[i].Comment)
-         dest[i].Comment = _mesa_strdup(src[i].Comment);
+         dest[i].Comment = strdup(src[i].Comment);
    }
    return dest;
 }
diff --git a/mesalib/src/mesa/program/prog_instruction.h b/mesalib/src/mesa/program/prog_instruction.h
index 0957bd9d7..ab3acbc02 100644
--- a/mesalib/src/mesa/program/prog_instruction.h
+++ b/mesalib/src/mesa/program/prog_instruction.h
@@ -366,11 +366,11 @@ struct prog_instruction
     */
    GLint BranchTarget;
 
-   /** for debugging purposes */
-   const char *Comment;
-
    /** for driver use (try to remove someday) */
    GLint Aux;
+
+   /** for debugging purposes */
+   const char *Comment;
 };
 
 
diff --git a/mesalib/src/mesa/program/prog_parameter.c b/mesalib/src/mesa/program/prog_parameter.c
index 5939f6f72..cdfe25145 100644
--- a/mesalib/src/mesa/program/prog_parameter.c
+++ b/mesalib/src/mesa/program/prog_parameter.c
@@ -148,7 +148,7 @@ _mesa_add_parameter(struct gl_program_parameter_list *paramList,
 
       for (i = 0; i < sz4; i++) {
          struct gl_program_parameter *p = paramList->Parameters + oldNum + i;
-         p->Name = name ? _mesa_strdup(name) : NULL;
+         p->Name = name ? strdup(name) : NULL;
          p->Type = type;
          p->Size = size;
          p->DataType = datatype;
diff --git a/mesalib/src/mesa/program/prog_statevars.c b/mesalib/src/mesa/program/prog_statevars.c
index 57b25a7e3..0c0c87faa 100644
--- a/mesalib/src/mesa/program/prog_statevars.c
+++ b/mesalib/src/mesa/program/prog_statevars.c
@@ -1045,7 +1045,7 @@ _mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
       break;
    }
 
-   return _mesa_strdup(str);
+   return strdup(str);
 }
 
 
diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c
index 61a9e97c9..3c214d5e3 100644
--- a/mesalib/src/mesa/program/program.c
+++ b/mesalib/src/mesa/program/program.c
@@ -79,7 +79,7 @@ _mesa_init_program(struct gl_context *ctx)
    STATIC_ASSERT(NUM_TEXTURE_TARGETS <= (1 << 4));
 
    ctx->Program.ErrorPos = -1;
-   ctx->Program.ErrorString = _mesa_strdup("");
+   ctx->Program.ErrorString = strdup("");
 
    ctx->VertexProgram.Enabled = GL_FALSE;
    ctx->VertexProgram.PointSizeEnabled =
@@ -176,7 +176,7 @@ _mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string)
    free((void *) ctx->Program.ErrorString);
    if (!string)
       string = "";
-   ctx->Program.ErrorString = _mesa_strdup(string);
+   ctx->Program.ErrorString = strdup(string);
 }
 
 
@@ -483,7 +483,7 @@ _mesa_clone_program(struct gl_context *ctx, const struct gl_program *prog)
    assert(clone->Target == prog->Target);
    assert(clone->RefCount == 1);
 
-   clone->String = (GLubyte *) _mesa_strdup((char *) prog->String);
+   clone->String = (GLubyte *) strdup((char *) prog->String);
    clone->Format = prog->Format;
    clone->Instructions = _mesa_alloc_instructions(prog->NumInstructions);
    if (!clone->Instructions) {
diff --git a/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
index 1dbc4b905..db254c214 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -485,8 +485,8 @@ st_clear_buffer_subdata(struct gl_context *ctx,
    static const char zeros[16] = {0};
 
    if (!pipe->clear_buffer) {
-      _mesa_buffer_clear_subdata(ctx, offset, size,
-                                 clearValue, clearValueSize, bufObj);
+      _mesa_ClearBufferSubData_sw(ctx, offset, size,
+                                  clearValue, clearValueSize, bufObj);
       return;
    }
 
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index a8b19a1f3..5c520b44f 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -178,9 +178,6 @@ st_FreeTextureImageBuffer(struct gl_context *ctx,
       pipe_resource_reference(&stImage->pt, NULL);
    }
 
-   _mesa_align_free(stImage->TexData);
-   stImage->TexData = NULL;
-
    free(stImage->transfer);
    stImage->transfer = NULL;
    stImage->num_transfers = 0;
@@ -501,7 +498,6 @@ st_AllocTextureImageBuffer(struct gl_context *ctx,
 
    DBG("%s\n", __FUNCTION__);
 
-   assert(!stImage->TexData);
    assert(!stImage->pt); /* xxx this might be wrong */
 
    /* Look if the parent texture object has space for this image */
@@ -1521,23 +1517,6 @@ copy_image_data_to_texture(struct st_context *st,
 
       pipe_resource_reference(&stImage->pt, NULL);
    }
-   else if (stImage->TexData) {
-      /* Copy from malloc'd memory */
-      /* XXX this should be re-examined/tested with a compressed format */
-      GLuint blockSize = util_format_get_blocksize(stObj->pt->format);
-      GLuint srcRowStride = stImage->base.Width * blockSize;
-      GLuint srcSliceStride = stImage->base.Height * srcRowStride;
-      st_texture_image_data(st,
-                            stObj->pt,
-                            stImage->base.Face,
-                            dstLevel,
-                            stImage->TexData,
-                            srcRowStride,
-                            srcSliceStride);
-      _mesa_align_free(stImage->TexData);
-      stImage->TexData = NULL;
-   }
-
    pipe_resource_reference(&stImage->pt, stObj->pt);
 }
 
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 bd191d864..efee4b258 100644
--- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -332,6 +332,7 @@ public:
    int glsl_version;
    bool native_integers;
    bool have_sqrt;
+   bool have_fma;
 
    variable_storage *find_variable_storage(ir_variable *var);
 
@@ -836,6 +837,7 @@ glsl_to_tgsi_visitor::get_opcode(ir_instruction *ir, unsigned op,
       case3fid(ADD, UADD, DADD);
       case3fid(MUL, UMUL, DMUL);
       case3fid(MAD, UMAD, DMAD);
+      case3fid(FMA, UMAD, DFMA);
       case3(DIV, IDIV, UDIV);
       case4d(MAX, IMAX, UMAX, DMAX);
       case4d(MIN, IMIN, UMIN, DMIN);
@@ -2222,10 +2224,11 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir)
       emit(ir, TGSI_OPCODE_IMUL_HI, result_dst, op[0], op[1]);
       break;
    case ir_triop_fma:
-      /* NOTE: Perhaps there should be a special opcode that enforces fused
-       * mul-add. Just use MAD for now.
-       */
-      emit(ir, TGSI_OPCODE_MAD, result_dst, op[0], op[1], op[2]);
+      /* In theory, MAD is incorrect here. */
+      if (have_fma)
+         emit(ir, TGSI_OPCODE_FMA, result_dst, op[0], op[1], op[2]);
+      else
+         emit(ir, TGSI_OPCODE_MAD, result_dst, op[0], op[1], op[2]);
       break;
    case ir_unop_interpolate_at_centroid:
       emit(ir, TGSI_OPCODE_INTERP_CENTROID, result_dst, op[0]);
@@ -5564,6 +5567,8 @@ get_mesa_program(struct gl_context *ctx,
 
    v->have_sqrt = pscreen->get_shader_param(pscreen, ptarget,
                                             PIPE_SHADER_CAP_TGSI_SQRT_SUPPORTED);
+   v->have_fma = pscreen->get_shader_param(pscreen, ptarget,
+                                           PIPE_SHADER_CAP_TGSI_FMA_SUPPORTED);
 
    _mesa_copy_linked_program_data(shader->Stage, shader_program, prog);
    _mesa_generate_parameters_list_for_uniforms(shader_program, shader,
diff --git a/mesalib/src/mesa/state_tracker/st_texture.c b/mesalib/src/mesa/state_tracker/st_texture.c
index ada984189..ca7c83c21 100644
--- a/mesalib/src/mesa/state_tracker/st_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_texture.c
@@ -310,46 +310,6 @@ st_texture_image_unmap(struct st_context *st,
    *transfer = NULL;
 }
 
-
-/* Upload data for a particular image.
- */
-void
-st_texture_image_data(struct st_context *st,
-                      struct pipe_resource *dst,
-                      GLuint face,
-                      GLuint level,
-                      void *src,
-                      GLuint src_row_stride, GLuint src_image_stride)
-{
-   struct pipe_context *pipe = st->pipe;
-   GLuint i;
-   const GLubyte *srcUB = src;
-   GLuint layers;
-
-   if (dst->target == PIPE_TEXTURE_1D_ARRAY ||
-       dst->target == PIPE_TEXTURE_2D_ARRAY ||
-       dst->target == PIPE_TEXTURE_CUBE_ARRAY)
-      layers = dst->array_size;
-   else
-      layers = u_minify(dst->depth0, level);
-
-   DBG("%s\n", __FUNCTION__);
-
-   for (i = 0; i < layers; i++) {
-      struct pipe_box box;
-      u_box_2d_zslice(0, 0, face + i,
-                      u_minify(dst->width0, level),
-                      u_minify(dst->height0, level),
-                      &box);
-
-      pipe->transfer_inline_write(pipe, dst, level, PIPE_TRANSFER_WRITE,
-                                  &box, srcUB, src_row_stride, 0);
-
-      srcUB += src_image_stride;
-   }
-}
-
-
 /**
  * For debug only: get/print center pixel in the src resource.
  */
diff --git a/mesalib/src/mesa/state_tracker/st_texture.h b/mesalib/src/mesa/state_tracker/st_texture.h
index 6b7f8c750..d8cd7c7b5 100644
--- a/mesalib/src/mesa/state_tracker/st_texture.h
+++ b/mesalib/src/mesa/state_tracker/st_texture.h
@@ -55,13 +55,7 @@ struct st_texture_image
 {
    struct gl_texture_image base;
 
-   /** Used to store texture data that doesn't fit in the parent
-    * object's mipmap buffer.
-    */
-   GLubyte *TexData;
-
    /* If stImage->pt != NULL, image data is stored here.
-    * Else if stImage->TexData != NULL, image is stored there.
     * Else there is no image data.
     */
    struct pipe_resource *pt;
@@ -230,16 +224,6 @@ st_texture_image_unmap(struct st_context *st,
 extern const GLuint *
 st_texture_depth_offsets(struct pipe_resource *pt, GLuint level);
 
-
-/* Upload an image into a texture
- */
-extern void
-st_texture_image_data(struct st_context *st,
-                      struct pipe_resource *dst,
-                      GLuint face, GLuint level, void *src,
-                      GLuint src_row_pitch, GLuint src_image_pitch);
-
-
 /* Copy an image between two textures
  */
 extern void
diff --git a/mesalib/src/mesa/state_tracker/st_vdpau.c b/mesalib/src/mesa/state_tracker/st_vdpau.c
index 6ccaf3e3f..63af1196a 100644
--- a/mesalib/src/mesa/state_tracker/st_vdpau.c
+++ b/mesalib/src/mesa/state_tracker/st_vdpau.c
@@ -66,7 +66,7 @@ st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access,
    struct pipe_sampler_view templ, **sampler_view;
    mesa_format texFormat;
 
-   getProcAddr = ctx->vdpGetProcAddress;
+   getProcAddr = (void *)ctx->vdpGetProcAddress;
    if (output) {
       VdpOutputSurfaceGallium *f;
       
diff --git a/mesalib/src/mesa/swrast/s_blend.c b/mesalib/src/mesa/swrast/s_blend.c
index 7cb119407..8479b0bc0 100644
--- a/mesalib/src/mesa/swrast/s_blend.c
+++ b/mesalib/src/mesa/swrast/s_blend.c
@@ -48,9 +48,6 @@
 #if defined(USE_MMX_ASM)
 #include "x86/mmx.h"
 #include "x86/common_x86_asm.h"
-#define _BLENDAPI _ASMAPI
-#else
-#define _BLENDAPI
 #endif
 
 
@@ -69,7 +66,7 @@
  * No-op means the framebuffer values remain unchanged.
  * Any chanType ok.
  */
-static void _BLENDAPI
+static void
 blend_noop(struct gl_context *ctx, GLuint n, const GLubyte mask[],
            GLvoid *src, const GLvoid *dst, GLenum chanType)
 {
@@ -97,7 +94,7 @@ blend_noop(struct gl_context *ctx, GLuint n, const GLubyte mask[],
  * Special case for glBlendFunc(GL_ONE, GL_ZERO)
  * Any chanType ok.
  */
-static void _BLENDAPI
+static void
 blend_replace(struct gl_context *ctx, GLuint n, const GLubyte mask[],
               GLvoid *src, const GLvoid *dst, GLenum chanType)
 {
@@ -117,7 +114,7 @@ blend_replace(struct gl_context *ctx, GLuint n, const GLubyte mask[],
  * Common transparency blending mode:
  * glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA).
  */
-static void _BLENDAPI
+static void
 blend_transparency_ubyte(struct gl_context *ctx, GLuint n, const GLubyte mask[],
                          GLvoid *src, const GLvoid *dst, GLenum chanType)
 {
@@ -162,7 +159,7 @@ blend_transparency_ubyte(struct gl_context *ctx, GLuint n, const GLubyte mask[],
 }
 
 
-static void _BLENDAPI
+static void
 blend_transparency_ushort(struct gl_context *ctx, GLuint n, const GLubyte mask[],
                           GLvoid *src, const GLvoid *dst, GLenum chanType)
 {
@@ -200,7 +197,7 @@ blend_transparency_ushort(struct gl_context *ctx, GLuint n, const GLubyte mask[]
 }
 
 
-static void _BLENDAPI
+static void
 blend_transparency_float(struct gl_context *ctx, GLuint n, const GLubyte mask[],
                          GLvoid *src, const GLvoid *dst, GLenum chanType)
 {
@@ -242,7 +239,7 @@ blend_transparency_float(struct gl_context *ctx, GLuint n, const GLubyte mask[],
  * Add src and dest: glBlendFunc(GL_ONE, GL_ONE).
  * Any chanType ok.
  */
-static void _BLENDAPI
+static void
 blend_add(struct gl_context *ctx, GLuint n, const GLubyte mask[],
           GLvoid *src, const GLvoid *dst, GLenum chanType)
 {
@@ -308,7 +305,7 @@ blend_add(struct gl_context *ctx, GLuint n, const GLubyte mask[],
  * Blend min function.
  * Any chanType ok.
  */
-static void _BLENDAPI
+static void
 blend_min(struct gl_context *ctx, GLuint n, const GLubyte mask[],
           GLvoid *src, const GLvoid *dst, GLenum chanType)
 {
@@ -361,7 +358,7 @@ blend_min(struct gl_context *ctx, GLuint n, const GLubyte mask[],
  * Blend max function.
  * Any chanType ok.
  */
-static void _BLENDAPI
+static void
 blend_max(struct gl_context *ctx, GLuint n, const GLubyte mask[],
           GLvoid *src, const GLvoid *dst, GLenum chanType)
 {
@@ -415,7 +412,7 @@ blend_max(struct gl_context *ctx, GLuint n, const GLubyte mask[],
  * Modulate:  result = src * dest
  * Any chanType ok.
  */
-static void _BLENDAPI
+static void
 blend_modulate(struct gl_context *ctx, GLuint n, const GLubyte mask[],
                GLvoid *src, const GLvoid *dst, GLenum chanType)
 {
diff --git a/mesalib/src/mesa/swrast/s_context.c b/mesalib/src/mesa/swrast/s_context.c
index 51cc22760..ecde292e3 100644
--- a/mesalib/src/mesa/swrast/s_context.c
+++ b/mesalib/src/mesa/swrast/s_context.c
@@ -409,7 +409,7 @@ _swrast_validate_point( struct gl_context *ctx, const SWvertex *v0 )
  * Called via swrast->BlendFunc.  Examine GL state to choose a blending
  * function, then call it.
  */
-static void _ASMAPI
+static void
 _swrast_validate_blend_func(struct gl_context *ctx, GLuint n, const GLubyte mask[],
                             GLvoid *src, const GLvoid *dst,
                             GLenum chanType )
diff --git a/mesalib/src/mesa/swrast/s_context.h b/mesalib/src/mesa/swrast/s_context.h
index d6fbc5d54..7cf0e30dc 100644
--- a/mesalib/src/mesa/swrast/s_context.h
+++ b/mesalib/src/mesa/swrast/s_context.h
@@ -58,10 +58,10 @@ typedef void (*texture_sample_func)(struct gl_context *ctx,
                                     GLuint n, const GLfloat texcoords[][4],
                                     const GLfloat lambda[], GLfloat rgba[][4]);
 
-typedef void (_ASMAPIP blend_func)( struct gl_context *ctx, GLuint n,
-                                    const GLubyte mask[],
-                                    GLvoid *src, const GLvoid *dst,
-                                    GLenum chanType);
+typedef void (*blend_func)(struct gl_context *ctx, GLuint n,
+                           const GLubyte mask[],
+                           GLvoid *src, const GLvoid *dst,
+                           GLenum chanType);
 
 typedef void (*swrast_point_func)( struct gl_context *ctx, const SWvertex *);
 
diff --git a/mesalib/src/mesa/swrast/s_span.c b/mesalib/src/mesa/swrast/s_span.c
index 5d618f048..e304b6b5a 100644
--- a/mesalib/src/mesa/swrast/s_span.c
+++ b/mesalib/src/mesa/swrast/s_span.c
@@ -788,7 +788,7 @@ clip_span( struct gl_context *ctx, SWspan *span )
          memmove(ARRAY, ARRAY + (SHIFT), (LEN) * sizeof(ARRAY[0]))
 
          for (i = 0; i < VARYING_SLOT_MAX; i++) {
-            if (span->arrayAttribs & (1 << i)) {
+            if (span->arrayAttribs & BITFIELD64_BIT(i)) {
                /* shift array elements left by 'leftClip' */
                SHIFT_ARRAY(span->array->attribs[i], leftClip, n - leftClip);
             }
diff --git a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
index b1c3d9842..17e057836 100644
--- a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
@@ -30,35 +30,30 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 /* ATTR */
-#define ATTR( A, N, T, V0, V1, V2, V3 ) \
-        ATTR_##T((A), (N), (T), (V0), (V1), (V2), (V3))
-
-#define ATTR_GL_UNSIGNED_INT( A, N, T, V0, V1, V2, V3 ) \
-    ATTR_UNION(A, N, T, UINT_AS_UNION(V0), UINT_AS_UNION(V1), \
-        UINT_AS_UNION(V2), UINT_AS_UNION(V3))
-#define ATTR_GL_INT( A, N, T, V0, V1, V2, V3 ) \
-    ATTR_UNION(A, N, T, INT_AS_UNION(V0), INT_AS_UNION(V1), \
+#define ATTRI( A, N, V0, V1, V2, V3 ) \
+    ATTR_UNION(A, N, GL_INT, INT_AS_UNION(V0), INT_AS_UNION(V1), \
         INT_AS_UNION(V2), INT_AS_UNION(V3))
-#define ATTR_GL_FLOAT( A, N, T, V0, V1, V2, V3 ) \
-    ATTR_UNION(A, N, T, FLOAT_AS_UNION(V0), FLOAT_AS_UNION(V1),\
+#define ATTRUI( A, N, V0, V1, V2, V3 ) \
+    ATTR_UNION(A, N, GL_UNSIGNED_INT, UINT_AS_UNION(V0), UINT_AS_UNION(V1), \
+        UINT_AS_UNION(V2), UINT_AS_UNION(V3))
+#define ATTRF( A, N, V0, V1, V2, V3 ) \
+    ATTR_UNION(A, N, GL_FLOAT, FLOAT_AS_UNION(V0), FLOAT_AS_UNION(V1),\
         FLOAT_AS_UNION(V2), FLOAT_AS_UNION(V3))
 
 
 /* float */
-#define ATTR1FV( A, V ) ATTR( A, 1, GL_FLOAT, (V)[0], 0, 0, 1 )
-#define ATTR2FV( A, V ) ATTR( A, 2, GL_FLOAT, (V)[0], (V)[1], 0, 1 )
-#define ATTR3FV( A, V ) ATTR( A, 3, GL_FLOAT, (V)[0], (V)[1], (V)[2], 1 )
-#define ATTR4FV( A, V ) ATTR( A, 4, GL_FLOAT, (V)[0], (V)[1], (V)[2], (V)[3] )
+#define ATTR1FV( A, V ) ATTRF( A, 1, (V)[0], 0, 0, 1 )
+#define ATTR2FV( A, V ) ATTRF( A, 2, (V)[0], (V)[1], 0, 1 )
+#define ATTR3FV( A, V ) ATTRF( A, 3, (V)[0], (V)[1], (V)[2], 1 )
+#define ATTR4FV( A, V ) ATTRF( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )
 
-#define ATTR1F( A, X )          ATTR( A, 1, GL_FLOAT, X, 0, 0, 1 )
-#define ATTR2F( A, X, Y )       ATTR( A, 2, GL_FLOAT, X, Y, 0, 1 )
-#define ATTR3F( A, X, Y, Z )    ATTR( A, 3, GL_FLOAT, X, Y, Z, 1 )
-#define ATTR4F( A, X, Y, Z, W ) ATTR( A, 4, GL_FLOAT, X, Y, Z, W )
+#define ATTR1F( A, X )          ATTRF( A, 1, X, 0, 0, 1 )
+#define ATTR2F( A, X, Y )       ATTRF( A, 2, X, Y, 0, 1 )
+#define ATTR3F( A, X, Y, Z )    ATTRF( A, 3, X, Y, Z, 1 )
+#define ATTR4F( A, X, Y, Z, W ) ATTRF( A, 4, X, Y, Z, W )
 
-/* int */
-#define ATTRI( A, N, X, Y, Z, W) ATTR( A, N, GL_INT, \
-                                       X, Y, Z, W )
 
+/* int */
 #define ATTR2IV( A, V ) ATTRI( A, 2, (V)[0], (V)[1], 0, 1 )
 #define ATTR3IV( A, V ) ATTRI( A, 3, (V)[0], (V)[1], (V)[2], 1 )
 #define ATTR4IV( A, V ) ATTRI( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )
@@ -70,9 +65,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 /* uint */
-#define ATTRUI( A, N, X, Y, Z, W) ATTR( A, N, GL_UNSIGNED_INT, \
-                                        X, Y, Z, W )
-
 #define ATTR2UIV( A, V ) ATTRUI( A, 2, (V)[0], (V)[1], 0, 1 )
 #define ATTR3UIV( A, V ) ATTRUI( A, 3, (V)[0], (V)[1], (V)[2], 1 )
 #define ATTR4UIV( A, V ) ATTRUI( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )
@@ -82,7 +74,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define ATTR3UI( A, X, Y, Z )    ATTRUI( A, 3, X, Y, Z, 1 )
 #define ATTR4UI( A, X, Y, Z, W ) ATTRUI( A, 4, X, Y, Z, W )
 
-#define MAT_ATTR( A, N, V ) ATTR( A, N, GL_FLOAT, (V)[0], (V)[1], (V)[2], (V)[3] )
+#define MAT_ATTR( A, N, V ) ATTRF( A, N, (V)[0], (V)[1], (V)[2], (V)[3] )
 
 static inline float conv_ui10_to_norm_float(unsigned ui10)
 {
@@ -94,20 +86,20 @@ static inline float conv_ui2_to_norm_float(unsigned ui2)
    return ui2 / 3.0f;
 }
 
-#define ATTRUI10_1( A, UI ) ATTR( A, 1, GL_FLOAT, (UI) & 0x3ff, 0, 0, 1 )
-#define ATTRUI10_2( A, UI ) ATTR( A, 2, GL_FLOAT, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, 0, 1 )
-#define ATTRUI10_3( A, UI ) ATTR( A, 3, GL_FLOAT, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, 1 )
-#define ATTRUI10_4( A, UI ) ATTR( A, 4, GL_FLOAT, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, ((UI) >> 30) & 0x3 )
+#define ATTRUI10_1( A, UI ) ATTRF( A, 1, (UI) & 0x3ff, 0, 0, 1 )
+#define ATTRUI10_2( A, UI ) ATTRF( A, 2, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, 0, 1 )
+#define ATTRUI10_3( A, UI ) ATTRF( A, 3, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, 1 )
+#define ATTRUI10_4( A, UI ) ATTRF( A, 4, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, ((UI) >> 30) & 0x3 )
 
-#define ATTRUI10N_1( A, UI ) ATTR( A, 1, GL_FLOAT, conv_ui10_to_norm_float((UI) & 0x3ff), 0, 0, 1 )
-#define ATTRUI10N_2( A, UI ) ATTR( A, 2, GL_FLOAT, \
+#define ATTRUI10N_1( A, UI ) ATTRF( A, 1, conv_ui10_to_norm_float((UI) & 0x3ff), 0, 0, 1 )
+#define ATTRUI10N_2( A, UI ) ATTRF( A, 2, \
 				   conv_ui10_to_norm_float((UI) & 0x3ff), \
 				   conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), 0, 1 )
-#define ATTRUI10N_3( A, UI ) ATTR( A, 3, GL_FLOAT, \
+#define ATTRUI10N_3( A, UI ) ATTRF( A, 3, \
 				   conv_ui10_to_norm_float((UI) & 0x3ff), \
 				   conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), \
 				   conv_ui10_to_norm_float(((UI) >> 20) & 0x3ff), 1 )
-#define ATTRUI10N_4( A, UI ) ATTR( A, 4, GL_FLOAT, \
+#define ATTRUI10N_4( A, UI ) ATTRF( A, 4, \
 				   conv_ui10_to_norm_float((UI) & 0x3ff), \
 				   conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), \
 				   conv_ui10_to_norm_float(((UI) >> 20) & 0x3ff), \
@@ -180,30 +172,30 @@ static inline float conv_i2_to_norm_float(const struct gl_context *ctx, int i2)
    }
 }
 
-#define ATTRI10_1( A, I10 ) ATTR( A, 1, GL_FLOAT, conv_i10_to_i((I10) & 0x3ff), 0, 0, 1 )
-#define ATTRI10_2( A, I10 ) ATTR( A, 2, GL_FLOAT, \
+#define ATTRI10_1( A, I10 ) ATTRF( A, 1, conv_i10_to_i((I10) & 0x3ff), 0, 0, 1 )
+#define ATTRI10_2( A, I10 ) ATTRF( A, 2, \
 				conv_i10_to_i((I10) & 0x3ff),		\
 				conv_i10_to_i(((I10) >> 10) & 0x3ff), 0, 1 )
-#define ATTRI10_3( A, I10 ) ATTR( A, 3, GL_FLOAT, \
+#define ATTRI10_3( A, I10 ) ATTRF( A, 3, \
 				conv_i10_to_i((I10) & 0x3ff),	    \
 				conv_i10_to_i(((I10) >> 10) & 0x3ff), \
 				conv_i10_to_i(((I10) >> 20) & 0x3ff), 1 )
-#define ATTRI10_4( A, I10 ) ATTR( A, 4, GL_FLOAT, \
+#define ATTRI10_4( A, I10 ) ATTRF( A, 4, \
 				conv_i10_to_i((I10) & 0x3ff),		\
 				conv_i10_to_i(((I10) >> 10) & 0x3ff), \
 				conv_i10_to_i(((I10) >> 20) & 0x3ff), \
 				conv_i2_to_i(((I10) >> 30) & 0x3))
 
 
-#define ATTRI10N_1(ctx, A, I10) ATTR(A, 1, GL_FLOAT, conv_i10_to_norm_float(ctx, (I10) & 0x3ff), 0, 0, 1 )
-#define ATTRI10N_2(ctx, A, I10) ATTR(A, 2, GL_FLOAT, \
+#define ATTRI10N_1(ctx, A, I10) ATTRF(A, 1, conv_i10_to_norm_float(ctx, (I10) & 0x3ff), 0, 0, 1 )
+#define ATTRI10N_2(ctx, A, I10) ATTRF(A, 2, \
 				conv_i10_to_norm_float(ctx, (I10) & 0x3ff),		\
 				conv_i10_to_norm_float(ctx, ((I10) >> 10) & 0x3ff), 0, 1 )
-#define ATTRI10N_3(ctx, A, I10) ATTR(A, 3, GL_FLOAT, \
+#define ATTRI10N_3(ctx, A, I10) ATTRF(A, 3, \
 				conv_i10_to_norm_float(ctx, (I10) & 0x3ff),	    \
 				conv_i10_to_norm_float(ctx, ((I10) >> 10) & 0x3ff), \
 				conv_i10_to_norm_float(ctx, ((I10) >> 20) & 0x3ff), 1 )
-#define ATTRI10N_4(ctx, A, I10) ATTR(A, 4, GL_FLOAT, \
+#define ATTRI10N_4(ctx, A, I10) ATTRF(A, 4, \
 				conv_i10_to_norm_float(ctx, (I10) & 0x3ff),		\
 				conv_i10_to_norm_float(ctx, ((I10) >> 10) & 0x3ff), \
 				conv_i10_to_norm_float(ctx, ((I10) >> 20) & 0x3ff), \
diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c
index 9669abe7d..02741c2bc 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_api.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_api.c
@@ -1239,7 +1239,7 @@ VertexAttrib4f_nopos(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR(VBO_ATTRIB_GENERIC0 + index, 4, GL_FLOAT, x, y, z, w);
+      ATTRF(VBO_ATTRIB_GENERIC0 + index, 4, x, y, z, w);
    else
       ERROR(GL_INVALID_VALUE);
 }
diff --git a/mesalib/src/mesa/x86/3dnow.c b/mesalib/src/mesa/x86/3dnow.c
index c46cfbc57..df7c64fcb 100644
--- a/mesalib/src/mesa/x86/3dnow.c
+++ b/mesalib/src/mesa/x86/3dnow.c
@@ -47,20 +47,20 @@ DECLARE_XFORM_GROUP( 3dnow, 3 )
 DECLARE_XFORM_GROUP( 3dnow, 4 )
 
 
-extern void _ASMAPI
+extern void
 _mesa_v16_3dnow_general_xform( GLfloat *first_vert,
 			       const GLfloat *m,
 			       const GLfloat *src,
 			       GLuint src_stride,
 			       GLuint count );
 
-extern void _ASMAPI
+extern void
 _mesa_3dnow_project_vertices( GLfloat *first,
 			      GLfloat *last,
 			      const GLfloat *m,
 			      GLuint stride );
 
-extern void _ASMAPI
+extern void
 _mesa_3dnow_project_clipped_vertices( GLfloat *first,
 				      GLfloat *last,
 				      const GLfloat *m,
diff --git a/mesalib/src/mesa/x86/common_x86.c b/mesalib/src/mesa/x86/common_x86.c
index 14b497d06..86fbca91e 100644
--- a/mesalib/src/mesa/x86/common_x86.c
+++ b/mesalib/src/mesa/x86/common_x86.c
@@ -68,12 +68,12 @@ static int detection_debug = GL_FALSE;
 
 /* No reason for this to be public.
  */
-extern GLuint	_ASMAPI _mesa_x86_has_cpuid(void);
-extern void	_ASMAPI _mesa_x86_cpuid(GLuint op, GLuint *reg_eax, GLuint *reg_ebx, GLuint *reg_ecx, GLuint *reg_edx);
-extern GLuint	_ASMAPI _mesa_x86_cpuid_eax(GLuint op);
-extern GLuint	_ASMAPI _mesa_x86_cpuid_ebx(GLuint op);
-extern GLuint	_ASMAPI _mesa_x86_cpuid_ecx(GLuint op);
-extern GLuint	_ASMAPI _mesa_x86_cpuid_edx(GLuint op);
+extern GLuint _mesa_x86_has_cpuid(void);
+extern void _mesa_x86_cpuid(GLuint op, GLuint *reg_eax, GLuint *reg_ebx, GLuint *reg_ecx, GLuint *reg_edx);
+extern GLuint _mesa_x86_cpuid_eax(GLuint op);
+extern GLuint _mesa_x86_cpuid_ebx(GLuint op);
+extern GLuint _mesa_x86_cpuid_ecx(GLuint op);
+extern GLuint _mesa_x86_cpuid_edx(GLuint op);
 
 
 #if defined(USE_SSE_ASM)
diff --git a/mesalib/src/mesa/x86/mmx.h b/mesalib/src/mesa/x86/mmx.h
index 8101cf889..0c354907f 100644
--- a/mesalib/src/mesa/x86/mmx.h
+++ b/mesalib/src/mesa/x86/mmx.h
@@ -31,27 +31,27 @@
 
 struct gl_context;
 
-extern void _ASMAPI
+extern void
 _mesa_mmx_blend_transparency( struct gl_context *ctx, GLuint n, const GLubyte mask[],
                               GLvoid *rgba, const GLvoid *dest,
                               GLenum chanType );
 
-extern void _ASMAPI
+extern void
 _mesa_mmx_blend_add( struct gl_context *ctx, GLuint n, const GLubyte mask[],
                      GLvoid *rgba, const GLvoid *dest,
                      GLenum chanType );
 
-extern void _ASMAPI
+extern void
 _mesa_mmx_blend_min( struct gl_context *ctx, GLuint n, const GLubyte mask[],
                      GLvoid *rgba, const GLvoid *dest,
                      GLenum chanType );
 
-extern void _ASMAPI
+extern void
 _mesa_mmx_blend_max( struct gl_context *ctx, GLuint n, const GLubyte mask[],
                      GLvoid *rgba, const GLvoid *dest,
                      GLenum chanType );
 
-extern void _ASMAPI
+extern void
 _mesa_mmx_blend_modulate( struct gl_context *ctx, GLuint n, const GLubyte mask[],
                           GLvoid *rgba, const GLvoid *dest,
                           GLenum chanType );
diff --git a/mesalib/src/mesa/x86/sse.c b/mesalib/src/mesa/x86/sse.c
index 846184fa3..02fe18fa1 100644
--- a/mesalib/src/mesa/x86/sse.c
+++ b/mesalib/src/mesa/x86/sse.c
@@ -46,35 +46,35 @@ DECLARE_XFORM_GROUP( sse, 3 )
 
 #if 1
 /* Some functions are not written in SSE-assembly, because the fpu ones are faster */
-extern void _ASMAPI _mesa_sse_transform_normals_no_rot( NORM_ARGS );
-extern void _ASMAPI _mesa_sse_transform_rescale_normals( NORM_ARGS );
-extern void _ASMAPI _mesa_sse_transform_rescale_normals_no_rot( NORM_ARGS );
+extern void _mesa_sse_transform_normals_no_rot( NORM_ARGS );
+extern void _mesa_sse_transform_rescale_normals( NORM_ARGS );
+extern void _mesa_sse_transform_rescale_normals_no_rot( NORM_ARGS );
 
-extern void _ASMAPI _mesa_sse_transform_points4_general( XFORM_ARGS );
-extern void _ASMAPI _mesa_sse_transform_points4_3d( XFORM_ARGS );
+extern void _mesa_sse_transform_points4_general( XFORM_ARGS );
+extern void _mesa_sse_transform_points4_3d( XFORM_ARGS );
 /* XXX this function segfaults, see below */
-extern void _ASMAPI _mesa_sse_transform_points4_identity( XFORM_ARGS );
+extern void _mesa_sse_transform_points4_identity( XFORM_ARGS );
 /* XXX this one works, see below */
-extern void _ASMAPI _mesa_x86_transform_points4_identity( XFORM_ARGS );
+extern void _mesa_x86_transform_points4_identity( XFORM_ARGS );
 #else
 DECLARE_NORM_GROUP( sse )
 #endif
 
 
-extern void _ASMAPI
+extern void
 _mesa_v16_sse_general_xform( GLfloat *first_vert,
 			     const GLfloat *m,
 			     const GLfloat *src,
 			     GLuint src_stride,
 			     GLuint count );
 
-extern void _ASMAPI
+extern void
 _mesa_sse_project_vertices( GLfloat *first,
 			    GLfloat *last,
 			    const GLfloat *m,
 			    GLuint stride );
 
-extern void _ASMAPI
+extern void
 _mesa_sse_project_clipped_vertices( GLfloat *first,
 				    GLfloat *last,
 				    const GLfloat *m,
diff --git a/mesalib/src/mesa/x86/x86_xform.c b/mesalib/src/mesa/x86/x86_xform.c
index 007cd704d..8b5cf9139 100644
--- a/mesalib/src/mesa/x86/x86_xform.c
+++ b/mesalib/src/mesa/x86/x86_xform.c
@@ -54,7 +54,7 @@ DECLARE_XFORM_GROUP( x86, 3 )
 DECLARE_XFORM_GROUP( x86, 4 )
 
 
-extern GLvector4f * _ASMAPI
+extern GLvector4f *
 _mesa_x86_cliptest_points4( GLvector4f *clip_vec,
 			    GLvector4f *proj_vec,
 			    GLubyte clipMask[],
@@ -62,7 +62,7 @@ _mesa_x86_cliptest_points4( GLvector4f *clip_vec,
 			    GLubyte *andMask,
 			    GLboolean viewport_z_clip );
 
-extern GLvector4f * _ASMAPI
+extern GLvector4f *
 _mesa_x86_cliptest_points4_np( GLvector4f *clip_vec,
 			       GLvector4f *proj_vec,
 			       GLubyte clipMask[],
@@ -70,7 +70,7 @@ _mesa_x86_cliptest_points4_np( GLvector4f *clip_vec,
 			       GLubyte *andMask,
 			       GLboolean viewport_z_clip );
 
-extern void _ASMAPI
+extern void
 _mesa_v16_x86_cliptest_points4( GLfloat *first_vert,
 				GLfloat *last_vert,
 				GLubyte *or_mask,
@@ -78,7 +78,7 @@ _mesa_v16_x86_cliptest_points4( GLfloat *first_vert,
 				GLubyte *clip_mask,
 				GLboolean viewport_z_clip );
 
-extern void _ASMAPI
+extern void
 _mesa_v16_x86_general_xform( GLfloat *dest,
 			     const GLfloat *m,
 			     const GLfloat *src,
diff --git a/mesalib/src/mesa/x86/x86_xform.h b/mesalib/src/mesa/x86/x86_xform.h
index 12b9fb8ff..e398f64a4 100644
--- a/mesalib/src/mesa/x86/x86_xform.h
+++ b/mesalib/src/mesa/x86/x86_xform.h
@@ -39,13 +39,13 @@
 			const GLvector4f *from_vec
 
 #define DECLARE_XFORM_GROUP( pfx, sz ) \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_general( XFORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_identity( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_no_rot( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_perspective( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d( XFORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_no_rot( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d( XFORM_ARGS );
+extern void _mesa_##pfx##_transform_points##sz##_general( XFORM_ARGS );		\
+extern void _mesa_##pfx##_transform_points##sz##_identity( XFORM_ARGS );	\
+extern void _mesa_##pfx##_transform_points##sz##_3d_no_rot( XFORM_ARGS );	\
+extern void _mesa_##pfx##_transform_points##sz##_perspective( XFORM_ARGS );	\
+extern void _mesa_##pfx##_transform_points##sz##_2d( XFORM_ARGS );		\
+extern void _mesa_##pfx##_transform_points##sz##_2d_no_rot( XFORM_ARGS );	\
+extern void _mesa_##pfx##_transform_points##sz##_3d( XFORM_ARGS );
 
 #define ASSIGN_XFORM_GROUP( pfx, sz )					\
    _mesa_transform_tab[sz][MATRIX_GENERAL] =				\
@@ -75,14 +75,14 @@ extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d( XFORM_ARGS );
 			GLvector4f *dest
 
 #define DECLARE_NORM_GROUP( pfx ) \
-extern void _ASMAPI _mesa_##pfx##_rescale_normals( NORM_ARGS );				\
-extern void _ASMAPI _mesa_##pfx##_normalize_normals( NORM_ARGS );			\
-extern void _ASMAPI _mesa_##pfx##_transform_normals( NORM_ARGS );			\
-extern void _ASMAPI _mesa_##pfx##_transform_normals_no_rot( NORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals( NORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals_no_rot( NORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals( NORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals_no_rot( NORM_ARGS );
+extern void _mesa_##pfx##_rescale_normals( NORM_ARGS );				\
+extern void _mesa_##pfx##_normalize_normals( NORM_ARGS );			\
+extern void _mesa_##pfx##_transform_normals( NORM_ARGS );			\
+extern void _mesa_##pfx##_transform_normals_no_rot( NORM_ARGS );		\
+extern void _mesa_##pfx##_transform_rescale_normals( NORM_ARGS );		\
+extern void _mesa_##pfx##_transform_rescale_normals_no_rot( NORM_ARGS );	\
+extern void _mesa_##pfx##_transform_normalize_normals( NORM_ARGS );		\
+extern void _mesa_##pfx##_transform_normalize_normals_no_rot( NORM_ARGS );
 
 #define ASSIGN_NORM_GROUP( pfx )					\
    _mesa_normal_tab[NORM_RESCALE] =					\
diff --git a/mesalib/src/util/Makefile.am b/mesalib/src/util/Makefile.am
index ec49dc6cf..2e7542e42 100644
--- a/mesalib/src/util/Makefile.am
+++ b/mesalib/src/util/Makefile.am
@@ -50,7 +50,9 @@ endif
 
 libmesautil_la_LIBADD = $(SHA1_LIBS)
 
-check_PROGRAMS = u_atomic_test
+roundeven_test_LDADD = -lm
+
+check_PROGRAMS = u_atomic_test roundeven_test
 TESTS = $(check_PROGRAMS)
 
 BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
diff --git a/mesalib/src/util/Makefile.sources b/mesalib/src/util/Makefile.sources
index 560ea836a..3e0d02bad 100644
--- a/mesalib/src/util/Makefile.sources
+++ b/mesalib/src/util/Makefile.sources
@@ -14,6 +14,7 @@ MESA_UTIL_FILES :=	\
 	register_allocate.h \
 	rgtc.c \
 	rgtc.h \
+	rounding.h \
 	set.c \
 	set.h \
 	simple_list.h \
diff --git a/mesalib/src/util/macros.h b/mesalib/src/util/macros.h
index b862bfd5f..6c7bda7ae 100644
--- a/mesalib/src/util/macros.h
+++ b/mesalib/src/util/macros.h
@@ -73,15 +73,13 @@ do {                        \
    assert(!str);            \
    __builtin_unreachable(); \
 } while (0)
-#elif _MSC_VER >= 1200
+#elif defined (_MSC_VER)
 #define unreachable(str)    \
 do {                        \
    assert(!str);            \
    __assume(0);             \
 } while (0)
-#endif
-
-#ifndef unreachable
+#else
 #define unreachable(str) assert(!str)
 #endif
 
@@ -99,7 +97,7 @@ do {                       \
 #define assume(expr) ((expr) ? ((void) 0) \
                              : (assert(!"assumption failed"), \
                                 __builtin_unreachable()))
-#elif _MSC_VER >= 1200
+#elif defined (_MSC_VER)
 #define assume(expr) __assume(expr)
 #else
 #define assume(expr) assert(expr)
@@ -178,5 +176,11 @@ do {                       \
 #  endif
 #endif
 
+#ifdef HAVE_FUNC_ATTRIBUTE_UNUSED
+#define UNUSED __attribute__((unused))
+#else
+#define UNUSED
+#endif
+
 
 #endif /* UTIL_MACROS_H */
diff --git a/mesalib/src/util/roundeven_test.c b/mesalib/src/util/roundeven_test.c
new file mode 100644
index 000000000..7526db1f3
--- /dev/null
+++ b/mesalib/src/util/roundeven_test.c
@@ -0,0 +1,140 @@
+/*
+ * Copyright © 2015 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+#include <math.h>
+
+#include "macros.h"
+#include "rounding.h"
+
+int main(int argc, char *argv[])
+{
+   const struct {
+      float input, expected;
+   } float_data[] = {
+      { 0.0,                  0.0 },
+      { nextafterf(0.5, 0.0), 0.0 },
+      { 0.5,                  0.0 },
+      { nextafterf(0.5, 1.0), 1.0 },
+      { 1.0,                  1.0 },
+      { nextafterf(1.5, 1.0), 1.0 },
+      { 1.5,                  2.0 },
+      { nextafterf(1.5, 2.0), 2.0 },
+      { 2.0,                  2.0 },
+      { nextafterf(2.5, 2.0), 2.0 },
+      { 2.5,                  2.0 },
+      { nextafterf(2.5, 3.0), 3.0 },
+   };
+
+   const struct {
+      double input, expected;
+   } double_data[] = {
+      { 0.0,                 0.0 },
+      { nextafter(0.5, 0.0), 0.0 },
+      { 0.5,                 0.0 },
+      { nextafter(0.5, 1.0), 1.0 },
+      { 1.0,                 1.0 },
+      { nextafter(1.5, 1.0), 1.0 },
+      { 1.5,                 2.0 },
+      { nextafter(1.5, 2.0), 2.0 },
+      { 2.0,                 2.0 },
+      { nextafter(2.5, 2.0), 2.0 },
+      { 2.5,                 2.0 },
+      { nextafter(2.5, 3.0), 3.0 },
+   };
+
+   bool failed = false;
+   int i;
+
+   for (i = 0; i < ARRAY_SIZE(float_data); i++) {
+      float output = _mesa_roundevenf(float_data[i].input);
+      if (memcmp(&float_data[i].expected, &output, sizeof(float))) {
+         fprintf(stderr, "%d float: expected %f (%a) from "
+                         "_mesa_roundevenf(%f (%a)) but got %f (%a)\n",
+                 i,
+                 float_data[i].expected,
+                 float_data[i].expected,
+                 float_data[i].input,
+                 float_data[i].input,
+                 output,
+                 output);
+         failed = true;
+      }
+   }
+
+   /* Test negated values */
+   for (i = 0; i < ARRAY_SIZE(float_data); i++) {
+      float output = _mesa_roundevenf(-float_data[i].input);
+      float negated_expected = -float_data[i].expected;
+      if (memcmp(&negated_expected, &output, sizeof(float))) {
+         fprintf(stderr, "%d float: expected %f (%a) from "
+                         "_mesa_roundevenf(%f (%a)) but got %f (%a)\n",
+                 i,
+                 negated_expected,
+                 negated_expected,
+                 -float_data[i].input,
+                 -float_data[i].input,
+                 output,
+                 output);
+         failed = true;
+      }
+   }
+
+   for (i = 0; i < ARRAY_SIZE(double_data); i++) {
+      double output = _mesa_roundeven(double_data[i].input);
+      if (memcmp(&double_data[i].expected, &output, sizeof(double))) {
+         fprintf(stderr, "%d double: expected %f (%a) from "
+                         "_mesa_roundeven(%f (%a)) but got %f (%a)\n",
+                 i,
+                 double_data[i].expected,
+                 double_data[i].expected,
+                 double_data[i].input,
+                 double_data[i].input,
+                 output,
+                 output);
+         failed = true;
+      }
+   }
+
+   /* Test negated values */
+   for (i = 0; i < ARRAY_SIZE(double_data); i++) {
+      double output = _mesa_roundeven(-double_data[i].input);
+      double negated_expected = -double_data[i].expected;
+      if (memcmp(&negated_expected, &output, sizeof(double))) {
+         fprintf(stderr, "%d double: expected %f (%a) from "
+                         "_mesa_roundeven(%f (%a)) but got %f (%a)\n",
+                 i,
+                 negated_expected,
+                 negated_expected,
+                 -double_data[i].input,
+                 -double_data[i].input,
+                 output,
+                 output);
+         failed = true;
+      }
+   }
+
+   return failed;
+}
diff --git a/mesalib/src/util/rounding.h b/mesalib/src/util/rounding.h
new file mode 100644
index 000000000..0cbe9269f
--- /dev/null
+++ b/mesalib/src/util/rounding.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2015 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include <math.h>
+
+#ifdef __SSE4_1__
+#include <smmintrin.h>
+#endif
+
+/* The C standard library has functions round()/rint()/nearbyint() that round
+ * their arguments according to the rounding mode set in the floating-point
+ * control register. While there are trunc()/ceil()/floor() functions that do
+ * a specific operation without modifying the rounding mode, there is no
+ * roundeven() in any version of C.
+ *
+ * Technical Specification 18661 (ISO/IEC TS 18661-1:2014) adds roundeven(),
+ * but it's unfortunately not implemented by glibc.
+ *
+ * This implementation differs in that it does not raise the inexact exception.
+ *
+ * We use rint() to implement these functions, with the assumption that the
+ * floating-point rounding mode has not been changed from the default Round
+ * to Nearest.
+ */
+
+/**
+ * \brief Rounds \c x to the nearest integer, with ties to the even integer.
+ */
+static inline float
+_mesa_roundevenf(float x)
+{
+#ifdef __SSE4_1__
+   float ret;
+   __m128 m = _mm_load_ss(&x);
+   m = _mm_round_ss(m, m, _MM_FROUND_CUR_DIRECTION | _MM_FROUND_NO_EXC);
+   _mm_store_ss(&ret, m);
+   return ret;
+#else
+   return rintf(x);
+#endif
+}
+
+/**
+ * \brief Rounds \c x to the nearest integer, with ties to the even integer.
+ */
+static inline double
+_mesa_roundeven(double x)
+{
+#ifdef __SSE4_1__
+   double ret;
+   __m128d m = _mm_load_sd(&x);
+   m = _mm_round_sd(m, m, _MM_FROUND_CUR_DIRECTION | _MM_FROUND_NO_EXC);
+   _mm_store_sd(&ret, m);
+   return ret;
+#else
+   return rint(x);
+#endif
+}
diff --git a/mesalib/src/util/u_atomic.h b/mesalib/src/util/u_atomic.h
index d15398e1e..e38395ac6 100644
--- a/mesalib/src/util/u_atomic.h
+++ b/mesalib/src/util/u_atomic.h
@@ -6,6 +6,8 @@
  *
  */
 
+#include "no_extern_c.h"
+
 #ifndef U_ATOMIC_H
 #define U_ATOMIC_H
 
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index ffce501b3..7dc39cf93 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -821,10 +821,10 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\format_unpack.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mapi\glapi\glapi_nop.c">
+    <ClCompile Include="..\..\..\..\src\glsl\opt_conditional_discard.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\opt_conditional_discard.cpp">
+    <ClCompile Include="..\..\..\..\src\mapi\glapi\glapi_nop.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/xkbcomp/parseutils.c b/xkbcomp/parseutils.c
index ab50c5710..e98adf123 100644
--- a/xkbcomp/parseutils.c
+++ b/xkbcomp/parseutils.c
@@ -29,7 +29,6 @@
 #include "xkbpath.h"
 #include <X11/keysym.h>
 #include <X11/extensions/XKBgeom.h>
-#include <X11/Xalloca.h>
 #include <limits.h>
 #include <stdlib.h>
 
diff --git a/xorg-server/Xext/xtest.c b/xorg-server/Xext/xtest.c
index 9bd90be7f..ff0351546 100644
--- a/xorg-server/Xext/xtest.c
+++ b/xorg-server/Xext/xtest.c
@@ -418,7 +418,7 @@ ProcXTestFakeInput(ClientPtr client)
     case KeyPress:
     case KeyRelease:
         nevents =
-            GetKeyboardEvents(xtest_evlist, dev, type, ev->u.u.detail, NULL);
+            GetKeyboardEvents(xtest_evlist, dev, type, ev->u.u.detail);
         break;
     }
 
diff --git a/xorg-server/autogen.sh b/xorg-server/autogen.sh
index dd0731ad9..aee4beba2 100644
--- a/xorg-server/autogen.sh
+++ b/xorg-server/autogen.sh
@@ -1,14 +1,14 @@
 #! /bin/sh
 
-srcdir=`dirname $0`
+srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.
 
 ORIGDIR=`pwd`
-cd $srcdir
+cd "$srcdir"
 
 autoreconf --force -v --install || exit 1
-cd $ORIGDIR || exit $?
+cd "$ORIGDIR" || exit $?
 
 if test -z "$NOCONFIGURE"; then
-    exec $srcdir/configure "$@"
+    exec "$srcdir"/configure "$@"
 fi
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index fe906cbb2..bbf6d3066 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -2519,7 +2519,7 @@ ReleaseButtonsAndKeys(DeviceIntPtr dev)
     /* Release all keys */
     for (i = 0; k && i < MAP_LENGTH; i++) {
         if (BitIsOn(k->down, i)) {
-            nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i, NULL);
+            nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i);
             for (j = 0; j < nevents; j++)
                 mieqProcessDeviceEvent(dev, &eventlist[j], NULL);
         }
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index 5e6963fe4..b86c5a6ce 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -1060,21 +1060,18 @@ event_set_root_coordinates(DeviceEvent *event, double x, double y)
  *
  * This function is not reentrant. Disable signals before calling.
  *
- * FIXME: flags for relative/abs motion?
- *
  * @param device The device to generate the event for
  * @param type Event type, one of KeyPress or KeyRelease
  * @param keycode Key code of the pressed/released key
- * @param mask Valuator mask for valuators present for this event.
  *
  */
 void
 QueueKeyboardEvents(DeviceIntPtr device, int type,
-                    int keycode, const ValuatorMask *mask)
+                    int keycode)
 {
     int nevents;
 
-    nevents = GetKeyboardEvents(InputEventList, device, type, keycode, mask);
+    nevents = GetKeyboardEvents(InputEventList, device, type, keycode);
     queueEventList(device, InputEventList, nevents);
 }
 
@@ -1089,20 +1086,17 @@ QueueKeyboardEvents(DeviceIntPtr device, int type,
  */
 int
 GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
-                  int key_code, const ValuatorMask *mask_in)
+                  int key_code)
 {
     int num_events = 0;
     CARD32 ms = 0;
     DeviceEvent *event;
     RawDeviceEvent *raw;
-    ValuatorMask mask;
 
 #if XSERVER_DTRACE
     if (XSERVER_INPUT_EVENT_ENABLED()) {
-        XSERVER_INPUT_EVENT(pDev->id, type, key_code, 0,
-                            mask_in ? mask_in->last_bit + 1 : 0,
-                            mask_in ? mask_in->mask : NULL,
-                            mask_in ? mask_in->valuators : NULL);
+        XSERVER_INPUT_EVENT(pDev->id, type, key_code, 0, 0,
+                            NULL, NULL);
     }
 #endif
 
@@ -1115,11 +1109,6 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
         (key_code < 8 || key_code > 255))
         return 0;
 
-    if (mask_in && valuator_mask_size(mask_in) > 1) {
-        ErrorF("[dix] the server does not handle valuator masks with "
-               "keyboard events. This is a bug. You may fix it.\n");
-    }
-
     num_events = 1;
 
     events =
@@ -1141,14 +1130,7 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
     events++;
     num_events++;
 
-    valuator_mask_copy(&mask, mask_in);
-
     init_raw(pDev, raw, ms, type, key_code);
-    set_raw_valuators(raw, &mask, raw->valuators.data_raw);
-
-    clipValuators(pDev, &mask);
-
-    set_raw_valuators(raw, &mask, raw->valuators.data);
 
     event = &events->device_event;
     init_device_event(event, pDev, ms);
@@ -1163,18 +1145,6 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
         set_key_up(pDev, key_code, KEY_POSTED);
     }
 
-    clipValuators(pDev, &mask);
-
-    set_valuators(pDev, event, &mask);
-
-    if (!IsFloating(pDev)) {
-        DeviceIntPtr master = GetMaster(pDev, MASTER_POINTER);
-
-        event_set_root_coordinates(event,
-                                   master->last.valuators[0],
-                                   master->last.valuators[1]);
-    }
-
     return num_events;
 }
 
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index 4dd277093..a7c708bd0 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -63,7 +63,7 @@
     } while(0)
 
 /* total number of offsets below */
-#define _gloffset_COUNT 1224
+#define _gloffset_COUNT 1240
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -473,7 +473,7 @@
 #define _gloffset_MultiTexCoord4iv 405
 #define _gloffset_MultiTexCoord4s 406
 #define _gloffset_MultiTexCoord4sv 407
-#define driDispatchRemapTable_size 816
+#define driDispatchRemapTable_size 832
 SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define CompressedTexImage1D_remap_index 0
@@ -952,346 +952,362 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define BindVertexBuffers_remap_index 473
 #define ClipControl_remap_index 474
 #define BindTextureUnit_remap_index 475
-#define CompressedTextureSubImage1D_remap_index 476
-#define CompressedTextureSubImage2D_remap_index 477
-#define CompressedTextureSubImage3D_remap_index 478
-#define CopyTextureSubImage1D_remap_index 479
-#define CopyTextureSubImage2D_remap_index 480
-#define CopyTextureSubImage3D_remap_index 481
-#define CreateTextures_remap_index 482
-#define GenerateTextureMipmap_remap_index 483
-#define GetCompressedTextureImage_remap_index 484
-#define GetTextureImage_remap_index 485
-#define GetTextureLevelParameterfv_remap_index 486
-#define GetTextureLevelParameteriv_remap_index 487
-#define GetTextureParameterIiv_remap_index 488
-#define GetTextureParameterIuiv_remap_index 489
-#define GetTextureParameterfv_remap_index 490
-#define GetTextureParameteriv_remap_index 491
-#define TextureBuffer_remap_index 492
-#define TextureParameterIiv_remap_index 493
-#define TextureParameterIuiv_remap_index 494
-#define TextureParameterf_remap_index 495
-#define TextureParameterfv_remap_index 496
-#define TextureParameteri_remap_index 497
-#define TextureParameteriv_remap_index 498
-#define TextureStorage1D_remap_index 499
-#define TextureStorage2D_remap_index 500
-#define TextureStorage2DMultisample_remap_index 501
-#define TextureStorage3D_remap_index 502
-#define TextureStorage3DMultisample_remap_index 503
-#define TextureSubImage1D_remap_index 504
-#define TextureSubImage2D_remap_index 505
-#define TextureSubImage3D_remap_index 506
-#define InvalidateBufferData_remap_index 507
-#define InvalidateBufferSubData_remap_index 508
-#define InvalidateFramebuffer_remap_index 509
-#define InvalidateSubFramebuffer_remap_index 510
-#define InvalidateTexImage_remap_index 511
-#define InvalidateTexSubImage_remap_index 512
-#define PolygonOffsetEXT_remap_index 513
-#define DrawTexfOES_remap_index 514
-#define DrawTexfvOES_remap_index 515
-#define DrawTexiOES_remap_index 516
-#define DrawTexivOES_remap_index 517
-#define DrawTexsOES_remap_index 518
-#define DrawTexsvOES_remap_index 519
-#define DrawTexxOES_remap_index 520
-#define DrawTexxvOES_remap_index 521
-#define PointSizePointerOES_remap_index 522
-#define QueryMatrixxOES_remap_index 523
-#define SampleMaskSGIS_remap_index 524
-#define SamplePatternSGIS_remap_index 525
-#define ColorPointerEXT_remap_index 526
-#define EdgeFlagPointerEXT_remap_index 527
-#define IndexPointerEXT_remap_index 528
-#define NormalPointerEXT_remap_index 529
-#define TexCoordPointerEXT_remap_index 530
-#define VertexPointerEXT_remap_index 531
-#define DiscardFramebufferEXT_remap_index 532
-#define ActiveShaderProgram_remap_index 533
-#define BindProgramPipeline_remap_index 534
-#define CreateShaderProgramv_remap_index 535
-#define DeleteProgramPipelines_remap_index 536
-#define GenProgramPipelines_remap_index 537
-#define GetProgramPipelineInfoLog_remap_index 538
-#define GetProgramPipelineiv_remap_index 539
-#define IsProgramPipeline_remap_index 540
-#define LockArraysEXT_remap_index 541
-#define ProgramUniform1d_remap_index 542
-#define ProgramUniform1dv_remap_index 543
-#define ProgramUniform1f_remap_index 544
-#define ProgramUniform1fv_remap_index 545
-#define ProgramUniform1i_remap_index 546
-#define ProgramUniform1iv_remap_index 547
-#define ProgramUniform1ui_remap_index 548
-#define ProgramUniform1uiv_remap_index 549
-#define ProgramUniform2d_remap_index 550
-#define ProgramUniform2dv_remap_index 551
-#define ProgramUniform2f_remap_index 552
-#define ProgramUniform2fv_remap_index 553
-#define ProgramUniform2i_remap_index 554
-#define ProgramUniform2iv_remap_index 555
-#define ProgramUniform2ui_remap_index 556
-#define ProgramUniform2uiv_remap_index 557
-#define ProgramUniform3d_remap_index 558
-#define ProgramUniform3dv_remap_index 559
-#define ProgramUniform3f_remap_index 560
-#define ProgramUniform3fv_remap_index 561
-#define ProgramUniform3i_remap_index 562
-#define ProgramUniform3iv_remap_index 563
-#define ProgramUniform3ui_remap_index 564
-#define ProgramUniform3uiv_remap_index 565
-#define ProgramUniform4d_remap_index 566
-#define ProgramUniform4dv_remap_index 567
-#define ProgramUniform4f_remap_index 568
-#define ProgramUniform4fv_remap_index 569
-#define ProgramUniform4i_remap_index 570
-#define ProgramUniform4iv_remap_index 571
-#define ProgramUniform4ui_remap_index 572
-#define ProgramUniform4uiv_remap_index 573
-#define ProgramUniformMatrix2dv_remap_index 574
-#define ProgramUniformMatrix2fv_remap_index 575
-#define ProgramUniformMatrix2x3dv_remap_index 576
-#define ProgramUniformMatrix2x3fv_remap_index 577
-#define ProgramUniformMatrix2x4dv_remap_index 578
-#define ProgramUniformMatrix2x4fv_remap_index 579
-#define ProgramUniformMatrix3dv_remap_index 580
-#define ProgramUniformMatrix3fv_remap_index 581
-#define ProgramUniformMatrix3x2dv_remap_index 582
-#define ProgramUniformMatrix3x2fv_remap_index 583
-#define ProgramUniformMatrix3x4dv_remap_index 584
-#define ProgramUniformMatrix3x4fv_remap_index 585
-#define ProgramUniformMatrix4dv_remap_index 586
-#define ProgramUniformMatrix4fv_remap_index 587
-#define ProgramUniformMatrix4x2dv_remap_index 588
-#define ProgramUniformMatrix4x2fv_remap_index 589
-#define ProgramUniformMatrix4x3dv_remap_index 590
-#define ProgramUniformMatrix4x3fv_remap_index 591
-#define UnlockArraysEXT_remap_index 592
-#define UseProgramStages_remap_index 593
-#define ValidateProgramPipeline_remap_index 594
-#define DebugMessageCallback_remap_index 595
-#define DebugMessageControl_remap_index 596
-#define DebugMessageInsert_remap_index 597
-#define GetDebugMessageLog_remap_index 598
-#define GetObjectLabel_remap_index 599
-#define GetObjectPtrLabel_remap_index 600
-#define ObjectLabel_remap_index 601
-#define ObjectPtrLabel_remap_index 602
-#define PopDebugGroup_remap_index 603
-#define PushDebugGroup_remap_index 604
-#define SecondaryColor3fEXT_remap_index 605
-#define SecondaryColor3fvEXT_remap_index 606
-#define MultiDrawElementsEXT_remap_index 607
-#define FogCoordfEXT_remap_index 608
-#define FogCoordfvEXT_remap_index 609
-#define ResizeBuffersMESA_remap_index 610
-#define WindowPos4dMESA_remap_index 611
-#define WindowPos4dvMESA_remap_index 612
-#define WindowPos4fMESA_remap_index 613
-#define WindowPos4fvMESA_remap_index 614
-#define WindowPos4iMESA_remap_index 615
-#define WindowPos4ivMESA_remap_index 616
-#define WindowPos4sMESA_remap_index 617
-#define WindowPos4svMESA_remap_index 618
-#define MultiModeDrawArraysIBM_remap_index 619
-#define MultiModeDrawElementsIBM_remap_index 620
-#define AreProgramsResidentNV_remap_index 621
-#define ExecuteProgramNV_remap_index 622
-#define GetProgramParameterdvNV_remap_index 623
-#define GetProgramParameterfvNV_remap_index 624
-#define GetProgramStringNV_remap_index 625
-#define GetProgramivNV_remap_index 626
-#define GetTrackMatrixivNV_remap_index 627
-#define GetVertexAttribdvNV_remap_index 628
-#define GetVertexAttribfvNV_remap_index 629
-#define GetVertexAttribivNV_remap_index 630
-#define LoadProgramNV_remap_index 631
-#define ProgramParameters4dvNV_remap_index 632
-#define ProgramParameters4fvNV_remap_index 633
-#define RequestResidentProgramsNV_remap_index 634
-#define TrackMatrixNV_remap_index 635
-#define VertexAttrib1dNV_remap_index 636
-#define VertexAttrib1dvNV_remap_index 637
-#define VertexAttrib1fNV_remap_index 638
-#define VertexAttrib1fvNV_remap_index 639
-#define VertexAttrib1sNV_remap_index 640
-#define VertexAttrib1svNV_remap_index 641
-#define VertexAttrib2dNV_remap_index 642
-#define VertexAttrib2dvNV_remap_index 643
-#define VertexAttrib2fNV_remap_index 644
-#define VertexAttrib2fvNV_remap_index 645
-#define VertexAttrib2sNV_remap_index 646
-#define VertexAttrib2svNV_remap_index 647
-#define VertexAttrib3dNV_remap_index 648
-#define VertexAttrib3dvNV_remap_index 649
-#define VertexAttrib3fNV_remap_index 650
-#define VertexAttrib3fvNV_remap_index 651
-#define VertexAttrib3sNV_remap_index 652
-#define VertexAttrib3svNV_remap_index 653
-#define VertexAttrib4dNV_remap_index 654
-#define VertexAttrib4dvNV_remap_index 655
-#define VertexAttrib4fNV_remap_index 656
-#define VertexAttrib4fvNV_remap_index 657
-#define VertexAttrib4sNV_remap_index 658
-#define VertexAttrib4svNV_remap_index 659
-#define VertexAttrib4ubNV_remap_index 660
-#define VertexAttrib4ubvNV_remap_index 661
-#define VertexAttribPointerNV_remap_index 662
-#define VertexAttribs1dvNV_remap_index 663
-#define VertexAttribs1fvNV_remap_index 664
-#define VertexAttribs1svNV_remap_index 665
-#define VertexAttribs2dvNV_remap_index 666
-#define VertexAttribs2fvNV_remap_index 667
-#define VertexAttribs2svNV_remap_index 668
-#define VertexAttribs3dvNV_remap_index 669
-#define VertexAttribs3fvNV_remap_index 670
-#define VertexAttribs3svNV_remap_index 671
-#define VertexAttribs4dvNV_remap_index 672
-#define VertexAttribs4fvNV_remap_index 673
-#define VertexAttribs4svNV_remap_index 674
-#define VertexAttribs4ubvNV_remap_index 675
-#define GetTexBumpParameterfvATI_remap_index 676
-#define GetTexBumpParameterivATI_remap_index 677
-#define TexBumpParameterfvATI_remap_index 678
-#define TexBumpParameterivATI_remap_index 679
-#define AlphaFragmentOp1ATI_remap_index 680
-#define AlphaFragmentOp2ATI_remap_index 681
-#define AlphaFragmentOp3ATI_remap_index 682
-#define BeginFragmentShaderATI_remap_index 683
-#define BindFragmentShaderATI_remap_index 684
-#define ColorFragmentOp1ATI_remap_index 685
-#define ColorFragmentOp2ATI_remap_index 686
-#define ColorFragmentOp3ATI_remap_index 687
-#define DeleteFragmentShaderATI_remap_index 688
-#define EndFragmentShaderATI_remap_index 689
-#define GenFragmentShadersATI_remap_index 690
-#define PassTexCoordATI_remap_index 691
-#define SampleMapATI_remap_index 692
-#define SetFragmentShaderConstantATI_remap_index 693
-#define ActiveStencilFaceEXT_remap_index 694
-#define BindVertexArrayAPPLE_remap_index 695
-#define GenVertexArraysAPPLE_remap_index 696
-#define GetProgramNamedParameterdvNV_remap_index 697
-#define GetProgramNamedParameterfvNV_remap_index 698
-#define ProgramNamedParameter4dNV_remap_index 699
-#define ProgramNamedParameter4dvNV_remap_index 700
-#define ProgramNamedParameter4fNV_remap_index 701
-#define ProgramNamedParameter4fvNV_remap_index 702
-#define PrimitiveRestartNV_remap_index 703
-#define GetTexGenxvOES_remap_index 704
-#define TexGenxOES_remap_index 705
-#define TexGenxvOES_remap_index 706
-#define DepthBoundsEXT_remap_index 707
-#define BindFramebufferEXT_remap_index 708
-#define BindRenderbufferEXT_remap_index 709
-#define BufferParameteriAPPLE_remap_index 710
-#define FlushMappedBufferRangeAPPLE_remap_index 711
-#define VertexAttribI1iEXT_remap_index 712
-#define VertexAttribI1uiEXT_remap_index 713
-#define VertexAttribI2iEXT_remap_index 714
-#define VertexAttribI2ivEXT_remap_index 715
-#define VertexAttribI2uiEXT_remap_index 716
-#define VertexAttribI2uivEXT_remap_index 717
-#define VertexAttribI3iEXT_remap_index 718
-#define VertexAttribI3ivEXT_remap_index 719
-#define VertexAttribI3uiEXT_remap_index 720
-#define VertexAttribI3uivEXT_remap_index 721
-#define VertexAttribI4iEXT_remap_index 722
-#define VertexAttribI4ivEXT_remap_index 723
-#define VertexAttribI4uiEXT_remap_index 724
-#define VertexAttribI4uivEXT_remap_index 725
-#define ClearColorIiEXT_remap_index 726
-#define ClearColorIuiEXT_remap_index 727
-#define BindBufferOffsetEXT_remap_index 728
-#define BeginPerfMonitorAMD_remap_index 729
-#define DeletePerfMonitorsAMD_remap_index 730
-#define EndPerfMonitorAMD_remap_index 731
-#define GenPerfMonitorsAMD_remap_index 732
-#define GetPerfMonitorCounterDataAMD_remap_index 733
-#define GetPerfMonitorCounterInfoAMD_remap_index 734
-#define GetPerfMonitorCounterStringAMD_remap_index 735
-#define GetPerfMonitorCountersAMD_remap_index 736
-#define GetPerfMonitorGroupStringAMD_remap_index 737
-#define GetPerfMonitorGroupsAMD_remap_index 738
-#define SelectPerfMonitorCountersAMD_remap_index 739
-#define GetObjectParameterivAPPLE_remap_index 740
-#define ObjectPurgeableAPPLE_remap_index 741
-#define ObjectUnpurgeableAPPLE_remap_index 742
-#define ActiveProgramEXT_remap_index 743
-#define CreateShaderProgramEXT_remap_index 744
-#define UseShaderProgramEXT_remap_index 745
-#define TextureBarrierNV_remap_index 746
-#define VDPAUFiniNV_remap_index 747
-#define VDPAUGetSurfaceivNV_remap_index 748
-#define VDPAUInitNV_remap_index 749
-#define VDPAUIsSurfaceNV_remap_index 750
-#define VDPAUMapSurfacesNV_remap_index 751
-#define VDPAURegisterOutputSurfaceNV_remap_index 752
-#define VDPAURegisterVideoSurfaceNV_remap_index 753
-#define VDPAUSurfaceAccessNV_remap_index 754
-#define VDPAUUnmapSurfacesNV_remap_index 755
-#define VDPAUUnregisterSurfaceNV_remap_index 756
-#define BeginPerfQueryINTEL_remap_index 757
-#define CreatePerfQueryINTEL_remap_index 758
-#define DeletePerfQueryINTEL_remap_index 759
-#define EndPerfQueryINTEL_remap_index 760
-#define GetFirstPerfQueryIdINTEL_remap_index 761
-#define GetNextPerfQueryIdINTEL_remap_index 762
-#define GetPerfCounterInfoINTEL_remap_index 763
-#define GetPerfQueryDataINTEL_remap_index 764
-#define GetPerfQueryIdByNameINTEL_remap_index 765
-#define GetPerfQueryInfoINTEL_remap_index 766
-#define PolygonOffsetClampEXT_remap_index 767
-#define StencilFuncSeparateATI_remap_index 768
-#define ProgramEnvParameters4fvEXT_remap_index 769
-#define ProgramLocalParameters4fvEXT_remap_index 770
-#define EGLImageTargetRenderbufferStorageOES_remap_index 771
-#define EGLImageTargetTexture2DOES_remap_index 772
-#define AlphaFuncx_remap_index 773
-#define ClearColorx_remap_index 774
-#define ClearDepthx_remap_index 775
-#define Color4x_remap_index 776
-#define DepthRangex_remap_index 777
-#define Fogx_remap_index 778
-#define Fogxv_remap_index 779
-#define Frustumf_remap_index 780
-#define Frustumx_remap_index 781
-#define LightModelx_remap_index 782
-#define LightModelxv_remap_index 783
-#define Lightx_remap_index 784
-#define Lightxv_remap_index 785
-#define LineWidthx_remap_index 786
-#define LoadMatrixx_remap_index 787
-#define Materialx_remap_index 788
-#define Materialxv_remap_index 789
-#define MultMatrixx_remap_index 790
-#define MultiTexCoord4x_remap_index 791
-#define Normal3x_remap_index 792
-#define Orthof_remap_index 793
-#define Orthox_remap_index 794
-#define PointSizex_remap_index 795
-#define PolygonOffsetx_remap_index 796
-#define Rotatex_remap_index 797
-#define SampleCoveragex_remap_index 798
-#define Scalex_remap_index 799
-#define TexEnvx_remap_index 800
-#define TexEnvxv_remap_index 801
-#define TexParameterx_remap_index 802
-#define Translatex_remap_index 803
-#define ClipPlanef_remap_index 804
-#define ClipPlanex_remap_index 805
-#define GetClipPlanef_remap_index 806
-#define GetClipPlanex_remap_index 807
-#define GetFixedv_remap_index 808
-#define GetLightxv_remap_index 809
-#define GetMaterialxv_remap_index 810
-#define GetTexEnvxv_remap_index 811
-#define GetTexParameterxv_remap_index 812
-#define PointParameterx_remap_index 813
-#define PointParameterxv_remap_index 814
-#define TexParameterxv_remap_index 815
+#define ClearNamedBufferData_remap_index 476
+#define ClearNamedBufferSubData_remap_index 477
+#define CompressedTextureSubImage1D_remap_index 478
+#define CompressedTextureSubImage2D_remap_index 479
+#define CompressedTextureSubImage3D_remap_index 480
+#define CopyNamedBufferSubData_remap_index 481
+#define CopyTextureSubImage1D_remap_index 482
+#define CopyTextureSubImage2D_remap_index 483
+#define CopyTextureSubImage3D_remap_index 484
+#define CreateBuffers_remap_index 485
+#define CreateTextures_remap_index 486
+#define FlushMappedNamedBufferRange_remap_index 487
+#define GenerateTextureMipmap_remap_index 488
+#define GetCompressedTextureImage_remap_index 489
+#define GetNamedBufferParameteri64v_remap_index 490
+#define GetNamedBufferParameteriv_remap_index 491
+#define GetNamedBufferPointerv_remap_index 492
+#define GetNamedBufferSubData_remap_index 493
+#define GetTextureImage_remap_index 494
+#define GetTextureLevelParameterfv_remap_index 495
+#define GetTextureLevelParameteriv_remap_index 496
+#define GetTextureParameterIiv_remap_index 497
+#define GetTextureParameterIuiv_remap_index 498
+#define GetTextureParameterfv_remap_index 499
+#define GetTextureParameteriv_remap_index 500
+#define MapNamedBuffer_remap_index 501
+#define MapNamedBufferRange_remap_index 502
+#define NamedBufferData_remap_index 503
+#define NamedBufferStorage_remap_index 504
+#define NamedBufferSubData_remap_index 505
+#define TextureBuffer_remap_index 506
+#define TextureBufferRange_remap_index 507
+#define TextureParameterIiv_remap_index 508
+#define TextureParameterIuiv_remap_index 509
+#define TextureParameterf_remap_index 510
+#define TextureParameterfv_remap_index 511
+#define TextureParameteri_remap_index 512
+#define TextureParameteriv_remap_index 513
+#define TextureStorage1D_remap_index 514
+#define TextureStorage2D_remap_index 515
+#define TextureStorage2DMultisample_remap_index 516
+#define TextureStorage3D_remap_index 517
+#define TextureStorage3DMultisample_remap_index 518
+#define TextureSubImage1D_remap_index 519
+#define TextureSubImage2D_remap_index 520
+#define TextureSubImage3D_remap_index 521
+#define UnmapNamedBuffer_remap_index 522
+#define InvalidateBufferData_remap_index 523
+#define InvalidateBufferSubData_remap_index 524
+#define InvalidateFramebuffer_remap_index 525
+#define InvalidateSubFramebuffer_remap_index 526
+#define InvalidateTexImage_remap_index 527
+#define InvalidateTexSubImage_remap_index 528
+#define PolygonOffsetEXT_remap_index 529
+#define DrawTexfOES_remap_index 530
+#define DrawTexfvOES_remap_index 531
+#define DrawTexiOES_remap_index 532
+#define DrawTexivOES_remap_index 533
+#define DrawTexsOES_remap_index 534
+#define DrawTexsvOES_remap_index 535
+#define DrawTexxOES_remap_index 536
+#define DrawTexxvOES_remap_index 537
+#define PointSizePointerOES_remap_index 538
+#define QueryMatrixxOES_remap_index 539
+#define SampleMaskSGIS_remap_index 540
+#define SamplePatternSGIS_remap_index 541
+#define ColorPointerEXT_remap_index 542
+#define EdgeFlagPointerEXT_remap_index 543
+#define IndexPointerEXT_remap_index 544
+#define NormalPointerEXT_remap_index 545
+#define TexCoordPointerEXT_remap_index 546
+#define VertexPointerEXT_remap_index 547
+#define DiscardFramebufferEXT_remap_index 548
+#define ActiveShaderProgram_remap_index 549
+#define BindProgramPipeline_remap_index 550
+#define CreateShaderProgramv_remap_index 551
+#define DeleteProgramPipelines_remap_index 552
+#define GenProgramPipelines_remap_index 553
+#define GetProgramPipelineInfoLog_remap_index 554
+#define GetProgramPipelineiv_remap_index 555
+#define IsProgramPipeline_remap_index 556
+#define LockArraysEXT_remap_index 557
+#define ProgramUniform1d_remap_index 558
+#define ProgramUniform1dv_remap_index 559
+#define ProgramUniform1f_remap_index 560
+#define ProgramUniform1fv_remap_index 561
+#define ProgramUniform1i_remap_index 562
+#define ProgramUniform1iv_remap_index 563
+#define ProgramUniform1ui_remap_index 564
+#define ProgramUniform1uiv_remap_index 565
+#define ProgramUniform2d_remap_index 566
+#define ProgramUniform2dv_remap_index 567
+#define ProgramUniform2f_remap_index 568
+#define ProgramUniform2fv_remap_index 569
+#define ProgramUniform2i_remap_index 570
+#define ProgramUniform2iv_remap_index 571
+#define ProgramUniform2ui_remap_index 572
+#define ProgramUniform2uiv_remap_index 573
+#define ProgramUniform3d_remap_index 574
+#define ProgramUniform3dv_remap_index 575
+#define ProgramUniform3f_remap_index 576
+#define ProgramUniform3fv_remap_index 577
+#define ProgramUniform3i_remap_index 578
+#define ProgramUniform3iv_remap_index 579
+#define ProgramUniform3ui_remap_index 580
+#define ProgramUniform3uiv_remap_index 581
+#define ProgramUniform4d_remap_index 582
+#define ProgramUniform4dv_remap_index 583
+#define ProgramUniform4f_remap_index 584
+#define ProgramUniform4fv_remap_index 585
+#define ProgramUniform4i_remap_index 586
+#define ProgramUniform4iv_remap_index 587
+#define ProgramUniform4ui_remap_index 588
+#define ProgramUniform4uiv_remap_index 589
+#define ProgramUniformMatrix2dv_remap_index 590
+#define ProgramUniformMatrix2fv_remap_index 591
+#define ProgramUniformMatrix2x3dv_remap_index 592
+#define ProgramUniformMatrix2x3fv_remap_index 593
+#define ProgramUniformMatrix2x4dv_remap_index 594
+#define ProgramUniformMatrix2x4fv_remap_index 595
+#define ProgramUniformMatrix3dv_remap_index 596
+#define ProgramUniformMatrix3fv_remap_index 597
+#define ProgramUniformMatrix3x2dv_remap_index 598
+#define ProgramUniformMatrix3x2fv_remap_index 599
+#define ProgramUniformMatrix3x4dv_remap_index 600
+#define ProgramUniformMatrix3x4fv_remap_index 601
+#define ProgramUniformMatrix4dv_remap_index 602
+#define ProgramUniformMatrix4fv_remap_index 603
+#define ProgramUniformMatrix4x2dv_remap_index 604
+#define ProgramUniformMatrix4x2fv_remap_index 605
+#define ProgramUniformMatrix4x3dv_remap_index 606
+#define ProgramUniformMatrix4x3fv_remap_index 607
+#define UnlockArraysEXT_remap_index 608
+#define UseProgramStages_remap_index 609
+#define ValidateProgramPipeline_remap_index 610
+#define DebugMessageCallback_remap_index 611
+#define DebugMessageControl_remap_index 612
+#define DebugMessageInsert_remap_index 613
+#define GetDebugMessageLog_remap_index 614
+#define GetObjectLabel_remap_index 615
+#define GetObjectPtrLabel_remap_index 616
+#define ObjectLabel_remap_index 617
+#define ObjectPtrLabel_remap_index 618
+#define PopDebugGroup_remap_index 619
+#define PushDebugGroup_remap_index 620
+#define SecondaryColor3fEXT_remap_index 621
+#define SecondaryColor3fvEXT_remap_index 622
+#define MultiDrawElementsEXT_remap_index 623
+#define FogCoordfEXT_remap_index 624
+#define FogCoordfvEXT_remap_index 625
+#define ResizeBuffersMESA_remap_index 626
+#define WindowPos4dMESA_remap_index 627
+#define WindowPos4dvMESA_remap_index 628
+#define WindowPos4fMESA_remap_index 629
+#define WindowPos4fvMESA_remap_index 630
+#define WindowPos4iMESA_remap_index 631
+#define WindowPos4ivMESA_remap_index 632
+#define WindowPos4sMESA_remap_index 633
+#define WindowPos4svMESA_remap_index 634
+#define MultiModeDrawArraysIBM_remap_index 635
+#define MultiModeDrawElementsIBM_remap_index 636
+#define AreProgramsResidentNV_remap_index 637
+#define ExecuteProgramNV_remap_index 638
+#define GetProgramParameterdvNV_remap_index 639
+#define GetProgramParameterfvNV_remap_index 640
+#define GetProgramStringNV_remap_index 641
+#define GetProgramivNV_remap_index 642
+#define GetTrackMatrixivNV_remap_index 643
+#define GetVertexAttribdvNV_remap_index 644
+#define GetVertexAttribfvNV_remap_index 645
+#define GetVertexAttribivNV_remap_index 646
+#define LoadProgramNV_remap_index 647
+#define ProgramParameters4dvNV_remap_index 648
+#define ProgramParameters4fvNV_remap_index 649
+#define RequestResidentProgramsNV_remap_index 650
+#define TrackMatrixNV_remap_index 651
+#define VertexAttrib1dNV_remap_index 652
+#define VertexAttrib1dvNV_remap_index 653
+#define VertexAttrib1fNV_remap_index 654
+#define VertexAttrib1fvNV_remap_index 655
+#define VertexAttrib1sNV_remap_index 656
+#define VertexAttrib1svNV_remap_index 657
+#define VertexAttrib2dNV_remap_index 658
+#define VertexAttrib2dvNV_remap_index 659
+#define VertexAttrib2fNV_remap_index 660
+#define VertexAttrib2fvNV_remap_index 661
+#define VertexAttrib2sNV_remap_index 662
+#define VertexAttrib2svNV_remap_index 663
+#define VertexAttrib3dNV_remap_index 664
+#define VertexAttrib3dvNV_remap_index 665
+#define VertexAttrib3fNV_remap_index 666
+#define VertexAttrib3fvNV_remap_index 667
+#define VertexAttrib3sNV_remap_index 668
+#define VertexAttrib3svNV_remap_index 669
+#define VertexAttrib4dNV_remap_index 670
+#define VertexAttrib4dvNV_remap_index 671
+#define VertexAttrib4fNV_remap_index 672
+#define VertexAttrib4fvNV_remap_index 673
+#define VertexAttrib4sNV_remap_index 674
+#define VertexAttrib4svNV_remap_index 675
+#define VertexAttrib4ubNV_remap_index 676
+#define VertexAttrib4ubvNV_remap_index 677
+#define VertexAttribPointerNV_remap_index 678
+#define VertexAttribs1dvNV_remap_index 679
+#define VertexAttribs1fvNV_remap_index 680
+#define VertexAttribs1svNV_remap_index 681
+#define VertexAttribs2dvNV_remap_index 682
+#define VertexAttribs2fvNV_remap_index 683
+#define VertexAttribs2svNV_remap_index 684
+#define VertexAttribs3dvNV_remap_index 685
+#define VertexAttribs3fvNV_remap_index 686
+#define VertexAttribs3svNV_remap_index 687
+#define VertexAttribs4dvNV_remap_index 688
+#define VertexAttribs4fvNV_remap_index 689
+#define VertexAttribs4svNV_remap_index 690
+#define VertexAttribs4ubvNV_remap_index 691
+#define GetTexBumpParameterfvATI_remap_index 692
+#define GetTexBumpParameterivATI_remap_index 693
+#define TexBumpParameterfvATI_remap_index 694
+#define TexBumpParameterivATI_remap_index 695
+#define AlphaFragmentOp1ATI_remap_index 696
+#define AlphaFragmentOp2ATI_remap_index 697
+#define AlphaFragmentOp3ATI_remap_index 698
+#define BeginFragmentShaderATI_remap_index 699
+#define BindFragmentShaderATI_remap_index 700
+#define ColorFragmentOp1ATI_remap_index 701
+#define ColorFragmentOp2ATI_remap_index 702
+#define ColorFragmentOp3ATI_remap_index 703
+#define DeleteFragmentShaderATI_remap_index 704
+#define EndFragmentShaderATI_remap_index 705
+#define GenFragmentShadersATI_remap_index 706
+#define PassTexCoordATI_remap_index 707
+#define SampleMapATI_remap_index 708
+#define SetFragmentShaderConstantATI_remap_index 709
+#define ActiveStencilFaceEXT_remap_index 710
+#define BindVertexArrayAPPLE_remap_index 711
+#define GenVertexArraysAPPLE_remap_index 712
+#define GetProgramNamedParameterdvNV_remap_index 713
+#define GetProgramNamedParameterfvNV_remap_index 714
+#define ProgramNamedParameter4dNV_remap_index 715
+#define ProgramNamedParameter4dvNV_remap_index 716
+#define ProgramNamedParameter4fNV_remap_index 717
+#define ProgramNamedParameter4fvNV_remap_index 718
+#define PrimitiveRestartNV_remap_index 719
+#define GetTexGenxvOES_remap_index 720
+#define TexGenxOES_remap_index 721
+#define TexGenxvOES_remap_index 722
+#define DepthBoundsEXT_remap_index 723
+#define BindFramebufferEXT_remap_index 724
+#define BindRenderbufferEXT_remap_index 725
+#define BufferParameteriAPPLE_remap_index 726
+#define FlushMappedBufferRangeAPPLE_remap_index 727
+#define VertexAttribI1iEXT_remap_index 728
+#define VertexAttribI1uiEXT_remap_index 729
+#define VertexAttribI2iEXT_remap_index 730
+#define VertexAttribI2ivEXT_remap_index 731
+#define VertexAttribI2uiEXT_remap_index 732
+#define VertexAttribI2uivEXT_remap_index 733
+#define VertexAttribI3iEXT_remap_index 734
+#define VertexAttribI3ivEXT_remap_index 735
+#define VertexAttribI3uiEXT_remap_index 736
+#define VertexAttribI3uivEXT_remap_index 737
+#define VertexAttribI4iEXT_remap_index 738
+#define VertexAttribI4ivEXT_remap_index 739
+#define VertexAttribI4uiEXT_remap_index 740
+#define VertexAttribI4uivEXT_remap_index 741
+#define ClearColorIiEXT_remap_index 742
+#define ClearColorIuiEXT_remap_index 743
+#define BindBufferOffsetEXT_remap_index 744
+#define BeginPerfMonitorAMD_remap_index 745
+#define DeletePerfMonitorsAMD_remap_index 746
+#define EndPerfMonitorAMD_remap_index 747
+#define GenPerfMonitorsAMD_remap_index 748
+#define GetPerfMonitorCounterDataAMD_remap_index 749
+#define GetPerfMonitorCounterInfoAMD_remap_index 750
+#define GetPerfMonitorCounterStringAMD_remap_index 751
+#define GetPerfMonitorCountersAMD_remap_index 752
+#define GetPerfMonitorGroupStringAMD_remap_index 753
+#define GetPerfMonitorGroupsAMD_remap_index 754
+#define SelectPerfMonitorCountersAMD_remap_index 755
+#define GetObjectParameterivAPPLE_remap_index 756
+#define ObjectPurgeableAPPLE_remap_index 757
+#define ObjectUnpurgeableAPPLE_remap_index 758
+#define ActiveProgramEXT_remap_index 759
+#define CreateShaderProgramEXT_remap_index 760
+#define UseShaderProgramEXT_remap_index 761
+#define TextureBarrierNV_remap_index 762
+#define VDPAUFiniNV_remap_index 763
+#define VDPAUGetSurfaceivNV_remap_index 764
+#define VDPAUInitNV_remap_index 765
+#define VDPAUIsSurfaceNV_remap_index 766
+#define VDPAUMapSurfacesNV_remap_index 767
+#define VDPAURegisterOutputSurfaceNV_remap_index 768
+#define VDPAURegisterVideoSurfaceNV_remap_index 769
+#define VDPAUSurfaceAccessNV_remap_index 770
+#define VDPAUUnmapSurfacesNV_remap_index 771
+#define VDPAUUnregisterSurfaceNV_remap_index 772
+#define BeginPerfQueryINTEL_remap_index 773
+#define CreatePerfQueryINTEL_remap_index 774
+#define DeletePerfQueryINTEL_remap_index 775
+#define EndPerfQueryINTEL_remap_index 776
+#define GetFirstPerfQueryIdINTEL_remap_index 777
+#define GetNextPerfQueryIdINTEL_remap_index 778
+#define GetPerfCounterInfoINTEL_remap_index 779
+#define GetPerfQueryDataINTEL_remap_index 780
+#define GetPerfQueryIdByNameINTEL_remap_index 781
+#define GetPerfQueryInfoINTEL_remap_index 782
+#define PolygonOffsetClampEXT_remap_index 783
+#define StencilFuncSeparateATI_remap_index 784
+#define ProgramEnvParameters4fvEXT_remap_index 785
+#define ProgramLocalParameters4fvEXT_remap_index 786
+#define EGLImageTargetRenderbufferStorageOES_remap_index 787
+#define EGLImageTargetTexture2DOES_remap_index 788
+#define AlphaFuncx_remap_index 789
+#define ClearColorx_remap_index 790
+#define ClearDepthx_remap_index 791
+#define Color4x_remap_index 792
+#define DepthRangex_remap_index 793
+#define Fogx_remap_index 794
+#define Fogxv_remap_index 795
+#define Frustumf_remap_index 796
+#define Frustumx_remap_index 797
+#define LightModelx_remap_index 798
+#define LightModelxv_remap_index 799
+#define Lightx_remap_index 800
+#define Lightxv_remap_index 801
+#define LineWidthx_remap_index 802
+#define LoadMatrixx_remap_index 803
+#define Materialx_remap_index 804
+#define Materialxv_remap_index 805
+#define MultMatrixx_remap_index 806
+#define MultiTexCoord4x_remap_index 807
+#define Normal3x_remap_index 808
+#define Orthof_remap_index 809
+#define Orthox_remap_index 810
+#define PointSizex_remap_index 811
+#define PolygonOffsetx_remap_index 812
+#define Rotatex_remap_index 813
+#define SampleCoveragex_remap_index 814
+#define Scalex_remap_index 815
+#define TexEnvx_remap_index 816
+#define TexEnvxv_remap_index 817
+#define TexParameterx_remap_index 818
+#define Translatex_remap_index 819
+#define ClipPlanef_remap_index 820
+#define ClipPlanex_remap_index 821
+#define GetClipPlanef_remap_index 822
+#define GetClipPlanex_remap_index 823
+#define GetFixedv_remap_index 824
+#define GetLightxv_remap_index 825
+#define GetMaterialxv_remap_index 826
+#define GetTexEnvxv_remap_index 827
+#define GetTexParameterxv_remap_index 828
+#define PointParameterx_remap_index 829
+#define PointParameterxv_remap_index 830
+#define TexParameterxv_remap_index 831
 
 #define _gloffset_CompressedTexImage1D driDispatchRemapTable[CompressedTexImage1D_remap_index]
 #define _gloffset_CompressedTexImage2D driDispatchRemapTable[CompressedTexImage2D_remap_index]
@@ -1769,15 +1785,24 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_BindVertexBuffers driDispatchRemapTable[BindVertexBuffers_remap_index]
 #define _gloffset_ClipControl driDispatchRemapTable[ClipControl_remap_index]
 #define _gloffset_BindTextureUnit driDispatchRemapTable[BindTextureUnit_remap_index]
+#define _gloffset_ClearNamedBufferData driDispatchRemapTable[ClearNamedBufferData_remap_index]
+#define _gloffset_ClearNamedBufferSubData driDispatchRemapTable[ClearNamedBufferSubData_remap_index]
 #define _gloffset_CompressedTextureSubImage1D driDispatchRemapTable[CompressedTextureSubImage1D_remap_index]
 #define _gloffset_CompressedTextureSubImage2D driDispatchRemapTable[CompressedTextureSubImage2D_remap_index]
 #define _gloffset_CompressedTextureSubImage3D driDispatchRemapTable[CompressedTextureSubImage3D_remap_index]
+#define _gloffset_CopyNamedBufferSubData driDispatchRemapTable[CopyNamedBufferSubData_remap_index]
 #define _gloffset_CopyTextureSubImage1D driDispatchRemapTable[CopyTextureSubImage1D_remap_index]
 #define _gloffset_CopyTextureSubImage2D driDispatchRemapTable[CopyTextureSubImage2D_remap_index]
 #define _gloffset_CopyTextureSubImage3D driDispatchRemapTable[CopyTextureSubImage3D_remap_index]
+#define _gloffset_CreateBuffers driDispatchRemapTable[CreateBuffers_remap_index]
 #define _gloffset_CreateTextures driDispatchRemapTable[CreateTextures_remap_index]
+#define _gloffset_FlushMappedNamedBufferRange driDispatchRemapTable[FlushMappedNamedBufferRange_remap_index]
 #define _gloffset_GenerateTextureMipmap driDispatchRemapTable[GenerateTextureMipmap_remap_index]
 #define _gloffset_GetCompressedTextureImage driDispatchRemapTable[GetCompressedTextureImage_remap_index]
+#define _gloffset_GetNamedBufferParameteri64v driDispatchRemapTable[GetNamedBufferParameteri64v_remap_index]
+#define _gloffset_GetNamedBufferParameteriv driDispatchRemapTable[GetNamedBufferParameteriv_remap_index]
+#define _gloffset_GetNamedBufferPointerv driDispatchRemapTable[GetNamedBufferPointerv_remap_index]
+#define _gloffset_GetNamedBufferSubData driDispatchRemapTable[GetNamedBufferSubData_remap_index]
 #define _gloffset_GetTextureImage driDispatchRemapTable[GetTextureImage_remap_index]
 #define _gloffset_GetTextureLevelParameterfv driDispatchRemapTable[GetTextureLevelParameterfv_remap_index]
 #define _gloffset_GetTextureLevelParameteriv driDispatchRemapTable[GetTextureLevelParameteriv_remap_index]
@@ -1785,7 +1810,13 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_GetTextureParameterIuiv driDispatchRemapTable[GetTextureParameterIuiv_remap_index]
 #define _gloffset_GetTextureParameterfv driDispatchRemapTable[GetTextureParameterfv_remap_index]
 #define _gloffset_GetTextureParameteriv driDispatchRemapTable[GetTextureParameteriv_remap_index]
+#define _gloffset_MapNamedBuffer driDispatchRemapTable[MapNamedBuffer_remap_index]
+#define _gloffset_MapNamedBufferRange driDispatchRemapTable[MapNamedBufferRange_remap_index]
+#define _gloffset_NamedBufferData driDispatchRemapTable[NamedBufferData_remap_index]
+#define _gloffset_NamedBufferStorage driDispatchRemapTable[NamedBufferStorage_remap_index]
+#define _gloffset_NamedBufferSubData driDispatchRemapTable[NamedBufferSubData_remap_index]
 #define _gloffset_TextureBuffer driDispatchRemapTable[TextureBuffer_remap_index]
+#define _gloffset_TextureBufferRange driDispatchRemapTable[TextureBufferRange_remap_index]
 #define _gloffset_TextureParameterIiv driDispatchRemapTable[TextureParameterIiv_remap_index]
 #define _gloffset_TextureParameterIuiv driDispatchRemapTable[TextureParameterIuiv_remap_index]
 #define _gloffset_TextureParameterf driDispatchRemapTable[TextureParameterf_remap_index]
@@ -1800,6 +1831,7 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_TextureSubImage1D driDispatchRemapTable[TextureSubImage1D_remap_index]
 #define _gloffset_TextureSubImage2D driDispatchRemapTable[TextureSubImage2D_remap_index]
 #define _gloffset_TextureSubImage3D driDispatchRemapTable[TextureSubImage3D_remap_index]
+#define _gloffset_UnmapNamedBuffer driDispatchRemapTable[UnmapNamedBuffer_remap_index]
 #define _gloffset_InvalidateBufferData driDispatchRemapTable[InvalidateBufferData_remap_index]
 #define _gloffset_InvalidateBufferSubData driDispatchRemapTable[InvalidateBufferSubData_remap_index]
 #define _gloffset_InvalidateFramebuffer driDispatchRemapTable[InvalidateFramebuffer_remap_index]
@@ -11834,6 +11866,28 @@ static INLINE void SET_BindTextureUnit(struct _glapi_table *disp, void (GLAPIENT
    SET_by_offset(disp, _gloffset_BindTextureUnit, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_ClearNamedBufferData)(GLuint, GLenum, GLenum, GLenum, const GLvoid *);
+#define CALL_ClearNamedBufferData(disp, parameters) \
+    (* GET_ClearNamedBufferData(disp)) parameters
+static INLINE _glptr_ClearNamedBufferData GET_ClearNamedBufferData(struct _glapi_table *disp) {
+   return (_glptr_ClearNamedBufferData) (GET_by_offset(disp, _gloffset_ClearNamedBufferData));
+}
+
+static INLINE void SET_ClearNamedBufferData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLenum, GLenum, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_ClearNamedBufferData, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ClearNamedBufferSubData)(GLuint, GLenum, GLintptr, GLsizeiptr, GLenum, GLenum, const GLvoid *);
+#define CALL_ClearNamedBufferSubData(disp, parameters) \
+    (* GET_ClearNamedBufferSubData(disp)) parameters
+static INLINE _glptr_ClearNamedBufferSubData GET_ClearNamedBufferSubData(struct _glapi_table *disp) {
+   return (_glptr_ClearNamedBufferSubData) (GET_by_offset(disp, _gloffset_ClearNamedBufferSubData));
+}
+
+static INLINE void SET_ClearNamedBufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLintptr, GLsizeiptr, GLenum, GLenum, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_ClearNamedBufferSubData, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_CompressedTextureSubImage1D)(GLuint, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
 #define CALL_CompressedTextureSubImage1D(disp, parameters) \
     (* GET_CompressedTextureSubImage1D(disp)) parameters
@@ -11867,6 +11921,17 @@ static INLINE void SET_CompressedTextureSubImage3D(struct _glapi_table *disp, vo
    SET_by_offset(disp, _gloffset_CompressedTextureSubImage3D, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_CopyNamedBufferSubData)(GLuint, GLuint, GLintptr, GLintptr, GLsizeiptr);
+#define CALL_CopyNamedBufferSubData(disp, parameters) \
+    (* GET_CopyNamedBufferSubData(disp)) parameters
+static INLINE _glptr_CopyNamedBufferSubData GET_CopyNamedBufferSubData(struct _glapi_table *disp) {
+   return (_glptr_CopyNamedBufferSubData) (GET_by_offset(disp, _gloffset_CopyNamedBufferSubData));
+}
+
+static INLINE void SET_CopyNamedBufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLintptr, GLintptr, GLsizeiptr)) {
+   SET_by_offset(disp, _gloffset_CopyNamedBufferSubData, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_CopyTextureSubImage1D)(GLuint, GLint, GLint, GLint, GLint, GLsizei);
 #define CALL_CopyTextureSubImage1D(disp, parameters) \
     (* GET_CopyTextureSubImage1D(disp)) parameters
@@ -11900,6 +11965,17 @@ static INLINE void SET_CopyTextureSubImage3D(struct _glapi_table *disp, void (GL
    SET_by_offset(disp, _gloffset_CopyTextureSubImage3D, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_CreateBuffers)(GLsizei, GLuint *);
+#define CALL_CreateBuffers(disp, parameters) \
+    (* GET_CreateBuffers(disp)) parameters
+static INLINE _glptr_CreateBuffers GET_CreateBuffers(struct _glapi_table *disp) {
+   return (_glptr_CreateBuffers) (GET_by_offset(disp, _gloffset_CreateBuffers));
+}
+
+static INLINE void SET_CreateBuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+   SET_by_offset(disp, _gloffset_CreateBuffers, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_CreateTextures)(GLenum, GLsizei, GLuint *);
 #define CALL_CreateTextures(disp, parameters) \
     (* GET_CreateTextures(disp)) parameters
@@ -11911,6 +11987,17 @@ static INLINE void SET_CreateTextures(struct _glapi_table *disp, void (GLAPIENTR
    SET_by_offset(disp, _gloffset_CreateTextures, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_FlushMappedNamedBufferRange)(GLuint, GLintptr, GLsizeiptr);
+#define CALL_FlushMappedNamedBufferRange(disp, parameters) \
+    (* GET_FlushMappedNamedBufferRange(disp)) parameters
+static INLINE _glptr_FlushMappedNamedBufferRange GET_FlushMappedNamedBufferRange(struct _glapi_table *disp) {
+   return (_glptr_FlushMappedNamedBufferRange) (GET_by_offset(disp, _gloffset_FlushMappedNamedBufferRange));
+}
+
+static INLINE void SET_FlushMappedNamedBufferRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLintptr, GLsizeiptr)) {
+   SET_by_offset(disp, _gloffset_FlushMappedNamedBufferRange, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_GenerateTextureMipmap)(GLuint);
 #define CALL_GenerateTextureMipmap(disp, parameters) \
     (* GET_GenerateTextureMipmap(disp)) parameters
@@ -11933,6 +12020,50 @@ static INLINE void SET_GetCompressedTextureImage(struct _glapi_table *disp, void
    SET_by_offset(disp, _gloffset_GetCompressedTextureImage, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_GetNamedBufferParameteri64v)(GLuint, GLenum, GLint64 *);
+#define CALL_GetNamedBufferParameteri64v(disp, parameters) \
+    (* GET_GetNamedBufferParameteri64v(disp)) parameters
+static INLINE _glptr_GetNamedBufferParameteri64v GET_GetNamedBufferParameteri64v(struct _glapi_table *disp) {
+   return (_glptr_GetNamedBufferParameteri64v) (GET_by_offset(disp, _gloffset_GetNamedBufferParameteri64v));
+}
+
+static INLINE void SET_GetNamedBufferParameteri64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint64 *)) {
+   SET_by_offset(disp, _gloffset_GetNamedBufferParameteri64v, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetNamedBufferParameteriv)(GLuint, GLenum, GLint *);
+#define CALL_GetNamedBufferParameteriv(disp, parameters) \
+    (* GET_GetNamedBufferParameteriv(disp)) parameters
+static INLINE _glptr_GetNamedBufferParameteriv GET_GetNamedBufferParameteriv(struct _glapi_table *disp) {
+   return (_glptr_GetNamedBufferParameteriv) (GET_by_offset(disp, _gloffset_GetNamedBufferParameteriv));
+}
+
+static INLINE void SET_GetNamedBufferParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetNamedBufferParameteriv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetNamedBufferPointerv)(GLuint, GLenum, GLvoid **);
+#define CALL_GetNamedBufferPointerv(disp, parameters) \
+    (* GET_GetNamedBufferPointerv(disp)) parameters
+static INLINE _glptr_GetNamedBufferPointerv GET_GetNamedBufferPointerv(struct _glapi_table *disp) {
+   return (_glptr_GetNamedBufferPointerv) (GET_by_offset(disp, _gloffset_GetNamedBufferPointerv));
+}
+
+static INLINE void SET_GetNamedBufferPointerv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLvoid **)) {
+   SET_by_offset(disp, _gloffset_GetNamedBufferPointerv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetNamedBufferSubData)(GLuint, GLintptr, GLsizeiptr, GLvoid *);
+#define CALL_GetNamedBufferSubData(disp, parameters) \
+    (* GET_GetNamedBufferSubData(disp)) parameters
+static INLINE _glptr_GetNamedBufferSubData GET_GetNamedBufferSubData(struct _glapi_table *disp) {
+   return (_glptr_GetNamedBufferSubData) (GET_by_offset(disp, _gloffset_GetNamedBufferSubData));
+}
+
+static INLINE void SET_GetNamedBufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLintptr, GLsizeiptr, GLvoid *)) {
+   SET_by_offset(disp, _gloffset_GetNamedBufferSubData, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_GetTextureImage)(GLuint, GLint, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_GetTextureImage(disp, parameters) \
     (* GET_GetTextureImage(disp)) parameters
@@ -12010,6 +12141,61 @@ static INLINE void SET_GetTextureParameteriv(struct _glapi_table *disp, void (GL
    SET_by_offset(disp, _gloffset_GetTextureParameteriv, fn);
 }
 
+typedef GLvoid * (GLAPIENTRYP _glptr_MapNamedBuffer)(GLuint, GLenum);
+#define CALL_MapNamedBuffer(disp, parameters) \
+    (* GET_MapNamedBuffer(disp)) parameters
+static INLINE _glptr_MapNamedBuffer GET_MapNamedBuffer(struct _glapi_table *disp) {
+   return (_glptr_MapNamedBuffer) (GET_by_offset(disp, _gloffset_MapNamedBuffer));
+}
+
+static INLINE void SET_MapNamedBuffer(struct _glapi_table *disp, GLvoid * (GLAPIENTRYP fn)(GLuint, GLenum)) {
+   SET_by_offset(disp, _gloffset_MapNamedBuffer, fn);
+}
+
+typedef GLvoid * (GLAPIENTRYP _glptr_MapNamedBufferRange)(GLuint, GLintptr, GLsizeiptr, GLbitfield);
+#define CALL_MapNamedBufferRange(disp, parameters) \
+    (* GET_MapNamedBufferRange(disp)) parameters
+static INLINE _glptr_MapNamedBufferRange GET_MapNamedBufferRange(struct _glapi_table *disp) {
+   return (_glptr_MapNamedBufferRange) (GET_by_offset(disp, _gloffset_MapNamedBufferRange));
+}
+
+static INLINE void SET_MapNamedBufferRange(struct _glapi_table *disp, GLvoid * (GLAPIENTRYP fn)(GLuint, GLintptr, GLsizeiptr, GLbitfield)) {
+   SET_by_offset(disp, _gloffset_MapNamedBufferRange, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_NamedBufferData)(GLuint, GLsizeiptr, const GLvoid *, GLenum);
+#define CALL_NamedBufferData(disp, parameters) \
+    (* GET_NamedBufferData(disp)) parameters
+static INLINE _glptr_NamedBufferData GET_NamedBufferData(struct _glapi_table *disp) {
+   return (_glptr_NamedBufferData) (GET_by_offset(disp, _gloffset_NamedBufferData));
+}
+
+static INLINE void SET_NamedBufferData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizeiptr, const GLvoid *, GLenum)) {
+   SET_by_offset(disp, _gloffset_NamedBufferData, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_NamedBufferStorage)(GLuint, GLsizeiptr, const GLvoid *, GLbitfield);
+#define CALL_NamedBufferStorage(disp, parameters) \
+    (* GET_NamedBufferStorage(disp)) parameters
+static INLINE _glptr_NamedBufferStorage GET_NamedBufferStorage(struct _glapi_table *disp) {
+   return (_glptr_NamedBufferStorage) (GET_by_offset(disp, _gloffset_NamedBufferStorage));
+}
+
+static INLINE void SET_NamedBufferStorage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizeiptr, const GLvoid *, GLbitfield)) {
+   SET_by_offset(disp, _gloffset_NamedBufferStorage, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_NamedBufferSubData)(GLuint, GLintptr, GLsizeiptr, const GLvoid *);
+#define CALL_NamedBufferSubData(disp, parameters) \
+    (* GET_NamedBufferSubData(disp)) parameters
+static INLINE _glptr_NamedBufferSubData GET_NamedBufferSubData(struct _glapi_table *disp) {
+   return (_glptr_NamedBufferSubData) (GET_by_offset(disp, _gloffset_NamedBufferSubData));
+}
+
+static INLINE void SET_NamedBufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLintptr, GLsizeiptr, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_NamedBufferSubData, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_TextureBuffer)(GLuint, GLenum, GLuint);
 #define CALL_TextureBuffer(disp, parameters) \
     (* GET_TextureBuffer(disp)) parameters
@@ -12021,6 +12207,17 @@ static INLINE void SET_TextureBuffer(struct _glapi_table *disp, void (GLAPIENTRY
    SET_by_offset(disp, _gloffset_TextureBuffer, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_TextureBufferRange)(GLuint, GLenum, GLuint, GLintptr, GLsizeiptr);
+#define CALL_TextureBufferRange(disp, parameters) \
+    (* GET_TextureBufferRange(disp)) parameters
+static INLINE _glptr_TextureBufferRange GET_TextureBufferRange(struct _glapi_table *disp) {
+   return (_glptr_TextureBufferRange) (GET_by_offset(disp, _gloffset_TextureBufferRange));
+}
+
+static INLINE void SET_TextureBufferRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint, GLintptr, GLsizeiptr)) {
+   SET_by_offset(disp, _gloffset_TextureBufferRange, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_TextureParameterIiv)(GLuint, GLenum, const GLint *);
 #define CALL_TextureParameterIiv(disp, parameters) \
     (* GET_TextureParameterIiv(disp)) parameters
@@ -12175,6 +12372,17 @@ static INLINE void SET_TextureSubImage3D(struct _glapi_table *disp, void (GLAPIE
    SET_by_offset(disp, _gloffset_TextureSubImage3D, fn);
 }
 
+typedef GLboolean (GLAPIENTRYP _glptr_UnmapNamedBuffer)(GLuint);
+#define CALL_UnmapNamedBuffer(disp, parameters) \
+    (* GET_UnmapNamedBuffer(disp)) parameters
+static INLINE _glptr_UnmapNamedBuffer GET_UnmapNamedBuffer(struct _glapi_table *disp) {
+   return (_glptr_UnmapNamedBuffer) (GET_by_offset(disp, _gloffset_UnmapNamedBuffer));
+}
+
+static INLINE void SET_UnmapNamedBuffer(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_UnmapNamedBuffer, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_InvalidateBufferData)(GLuint);
 #define CALL_InvalidateBufferData(disp, parameters) \
     (* GET_InvalidateBufferData(disp)) parameters
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h
index 67bf1f42e..8084e5757 100644
--- a/xorg-server/glx/glapi.h
+++ b/xorg-server/glx/glapi.h
@@ -44,7 +44,7 @@
 #ifndef _GLAPI_H
 #define _GLAPI_H
 
-#include "u_thread.h"
+#include "util/macros.h"
 
 
 #ifdef __cplusplus
@@ -76,6 +76,8 @@ struct _glapi_table;
 
 typedef void (*_glapi_proc)(void); /* generic function pointer */
 
+typedef void (*_glapi_nop_handler_proc)(const char *name);
+
 typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
 
 
@@ -123,21 +125,12 @@ _GLAPI_EXPORT extern const void *_glapi_Context;
 SERVEXTERN struct _glapi_table *_glapi_Dispatch;
 SERVEXTERN void *_glapi_Context;
 
-# ifdef THREADS
-
-#  define GET_DISPATCH() \
+#define GET_DISPATCH() \
      (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch())
 
-#  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) \
+#define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) \
      (likely(_glapi_Context) ? _glapi_Context : _glapi_get_context())
 
-# else
-
-#  define GET_DISPATCH() _glapi_Dispatch
-#  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_Context
-
-# endif
-
 #endif /* defined (GLX_USE_TLS) */
 
 
@@ -188,6 +181,14 @@ extern struct _glapi_table *
 _glapi_create_table_from_handle(void *handle, const char *symbol_prefix);
 
 
+void
+_glapi_set_nop_handler(_glapi_nop_handler_proc func);
+
+/** Return pointer to new dispatch table filled with no-op functions */
+struct _glapi_table *
+_glapi_new_nop_table(unsigned num_entries);
+
+
 
 #ifdef __cplusplus
 }
diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h
index 7609d7ff3..4aea61dc1 100644
--- a/xorg-server/glx/glapitable.h
+++ b/xorg-server/glx/glapitable.h
@@ -925,346 +925,362 @@ struct _glapi_table
    void (GLAPIENTRYP BindVertexBuffers)(GLuint first, GLsizei count, const GLuint * buffers, const GLintptr * offsets, const GLsizei * strides); /* 881 */
    void (GLAPIENTRYP ClipControl)(GLenum origin, GLenum depth); /* 882 */
    void (GLAPIENTRYP BindTextureUnit)(GLuint unit, GLuint texture); /* 883 */
-   void (GLAPIENTRYP CompressedTextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 884 */
-   void (GLAPIENTRYP CompressedTextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 885 */
-   void (GLAPIENTRYP CompressedTextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 886 */
-   void (GLAPIENTRYP CopyTextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); /* 887 */
-   void (GLAPIENTRYP CopyTextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 888 */
-   void (GLAPIENTRYP CopyTextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 889 */
-   void (GLAPIENTRYP CreateTextures)(GLenum target, GLsizei n, GLuint * textures); /* 890 */
-   void (GLAPIENTRYP GenerateTextureMipmap)(GLuint texture); /* 891 */
-   void (GLAPIENTRYP GetCompressedTextureImage)(GLuint texture, GLint level, GLsizei bufSize, GLvoid * pixels); /* 892 */
-   void (GLAPIENTRYP GetTextureImage)(GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * pixels); /* 893 */
-   void (GLAPIENTRYP GetTextureLevelParameterfv)(GLuint texture, GLint level, GLenum pname, GLfloat * params); /* 894 */
-   void (GLAPIENTRYP GetTextureLevelParameteriv)(GLuint texture, GLint level, GLenum pname, GLint * params); /* 895 */
-   void (GLAPIENTRYP GetTextureParameterIiv)(GLuint texture, GLenum pname, GLint * params); /* 896 */
-   void (GLAPIENTRYP GetTextureParameterIuiv)(GLuint texture, GLenum pname, GLuint * params); /* 897 */
-   void (GLAPIENTRYP GetTextureParameterfv)(GLuint texture, GLenum pname, GLfloat * params); /* 898 */
-   void (GLAPIENTRYP GetTextureParameteriv)(GLuint texture, GLenum pname, GLint * params); /* 899 */
-   void (GLAPIENTRYP TextureBuffer)(GLuint texture, GLenum internalformat, GLuint buffer); /* 900 */
-   void (GLAPIENTRYP TextureParameterIiv)(GLuint texture, GLenum pname, const GLint * params); /* 901 */
-   void (GLAPIENTRYP TextureParameterIuiv)(GLuint texture, GLenum pname, const GLuint * params); /* 902 */
-   void (GLAPIENTRYP TextureParameterf)(GLuint texture, GLenum pname, GLfloat param); /* 903 */
-   void (GLAPIENTRYP TextureParameterfv)(GLuint texture, GLenum pname, const GLfloat * param); /* 904 */
-   void (GLAPIENTRYP TextureParameteri)(GLuint texture, GLenum pname, GLint param); /* 905 */
-   void (GLAPIENTRYP TextureParameteriv)(GLuint texture, GLenum pname, const GLint * param); /* 906 */
-   void (GLAPIENTRYP TextureStorage1D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width); /* 907 */
-   void (GLAPIENTRYP TextureStorage2D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); /* 908 */
-   void (GLAPIENTRYP TextureStorage2DMultisample)(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); /* 909 */
-   void (GLAPIENTRYP TextureStorage3D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); /* 910 */
-   void (GLAPIENTRYP TextureStorage3DMultisample)(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); /* 911 */
-   void (GLAPIENTRYP TextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels); /* 912 */
-   void (GLAPIENTRYP TextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels); /* 913 */
-   void (GLAPIENTRYP TextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels); /* 914 */
-   void (GLAPIENTRYP InvalidateBufferData)(GLuint buffer); /* 915 */
-   void (GLAPIENTRYP InvalidateBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 916 */
-   void (GLAPIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 917 */
-   void (GLAPIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height); /* 918 */
-   void (GLAPIENTRYP InvalidateTexImage)(GLuint texture, GLint level); /* 919 */
-   void (GLAPIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); /* 920 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 921 */
-   void (GLAPIENTRYP DrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); /* 922 */
-   void (GLAPIENTRYP DrawTexfvOES)(const GLfloat * coords); /* 923 */
-   void (GLAPIENTRYP DrawTexiOES)(GLint x, GLint y, GLint z, GLint width, GLint height); /* 924 */
-   void (GLAPIENTRYP DrawTexivOES)(const GLint * coords); /* 925 */
-   void (GLAPIENTRYP DrawTexsOES)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); /* 926 */
-   void (GLAPIENTRYP DrawTexsvOES)(const GLshort * coords); /* 927 */
-   void (GLAPIENTRYP DrawTexxOES)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); /* 928 */
-   void (GLAPIENTRYP DrawTexxvOES)(const GLfixed * coords); /* 929 */
-   void (GLAPIENTRYP PointSizePointerOES)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 930 */
-   GLbitfield (GLAPIENTRYP QueryMatrixxOES)(GLfixed * mantissa, GLint * exponent); /* 931 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 932 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 933 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 934 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 935 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 936 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 937 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 938 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 939 */
-   void (GLAPIENTRYP DiscardFramebufferEXT)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 940 */
-   void (GLAPIENTRYP ActiveShaderProgram)(GLuint pipeline, GLuint program); /* 941 */
-   void (GLAPIENTRYP BindProgramPipeline)(GLuint pipeline); /* 942 */
-   GLuint (GLAPIENTRYP CreateShaderProgramv)(GLenum type, GLsizei count, const GLchar * const * strings); /* 943 */
-   void (GLAPIENTRYP DeleteProgramPipelines)(GLsizei n, const GLuint * pipelines); /* 944 */
-   void (GLAPIENTRYP GenProgramPipelines)(GLsizei n, GLuint * pipelines); /* 945 */
-   void (GLAPIENTRYP GetProgramPipelineInfoLog)(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 946 */
-   void (GLAPIENTRYP GetProgramPipelineiv)(GLuint pipeline, GLenum pname, GLint * params); /* 947 */
-   GLboolean (GLAPIENTRYP IsProgramPipeline)(GLuint pipeline); /* 948 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 949 */
-   void (GLAPIENTRYP ProgramUniform1d)(GLuint program, GLint location, GLdouble x); /* 950 */
-   void (GLAPIENTRYP ProgramUniform1dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 951 */
-   void (GLAPIENTRYP ProgramUniform1f)(GLuint program, GLint location, GLfloat x); /* 952 */
-   void (GLAPIENTRYP ProgramUniform1fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 953 */
-   void (GLAPIENTRYP ProgramUniform1i)(GLuint program, GLint location, GLint x); /* 954 */
-   void (GLAPIENTRYP ProgramUniform1iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 955 */
-   void (GLAPIENTRYP ProgramUniform1ui)(GLuint program, GLint location, GLuint x); /* 956 */
-   void (GLAPIENTRYP ProgramUniform1uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 957 */
-   void (GLAPIENTRYP ProgramUniform2d)(GLuint program, GLint location, GLdouble x, GLdouble y); /* 958 */
-   void (GLAPIENTRYP ProgramUniform2dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 959 */
-   void (GLAPIENTRYP ProgramUniform2f)(GLuint program, GLint location, GLfloat x, GLfloat y); /* 960 */
-   void (GLAPIENTRYP ProgramUniform2fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 961 */
-   void (GLAPIENTRYP ProgramUniform2i)(GLuint program, GLint location, GLint x, GLint y); /* 962 */
-   void (GLAPIENTRYP ProgramUniform2iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 963 */
-   void (GLAPIENTRYP ProgramUniform2ui)(GLuint program, GLint location, GLuint x, GLuint y); /* 964 */
-   void (GLAPIENTRYP ProgramUniform2uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 965 */
-   void (GLAPIENTRYP ProgramUniform3d)(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); /* 966 */
-   void (GLAPIENTRYP ProgramUniform3dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 967 */
-   void (GLAPIENTRYP ProgramUniform3f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); /* 968 */
-   void (GLAPIENTRYP ProgramUniform3fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 969 */
-   void (GLAPIENTRYP ProgramUniform3i)(GLuint program, GLint location, GLint x, GLint y, GLint z); /* 970 */
-   void (GLAPIENTRYP ProgramUniform3iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 971 */
-   void (GLAPIENTRYP ProgramUniform3ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z); /* 972 */
-   void (GLAPIENTRYP ProgramUniform3uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 973 */
-   void (GLAPIENTRYP ProgramUniform4d)(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 974 */
-   void (GLAPIENTRYP ProgramUniform4dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 975 */
-   void (GLAPIENTRYP ProgramUniform4f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 976 */
-   void (GLAPIENTRYP ProgramUniform4fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 977 */
-   void (GLAPIENTRYP ProgramUniform4i)(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); /* 978 */
-   void (GLAPIENTRYP ProgramUniform4iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 979 */
-   void (GLAPIENTRYP ProgramUniform4ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 980 */
-   void (GLAPIENTRYP ProgramUniform4uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 981 */
-   void (GLAPIENTRYP ProgramUniformMatrix2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 982 */
-   void (GLAPIENTRYP ProgramUniformMatrix2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 983 */
-   void (GLAPIENTRYP ProgramUniformMatrix2x3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 984 */
-   void (GLAPIENTRYP ProgramUniformMatrix2x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 985 */
-   void (GLAPIENTRYP ProgramUniformMatrix2x4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 986 */
-   void (GLAPIENTRYP ProgramUniformMatrix2x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 987 */
-   void (GLAPIENTRYP ProgramUniformMatrix3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 988 */
-   void (GLAPIENTRYP ProgramUniformMatrix3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 989 */
-   void (GLAPIENTRYP ProgramUniformMatrix3x2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 990 */
-   void (GLAPIENTRYP ProgramUniformMatrix3x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 991 */
-   void (GLAPIENTRYP ProgramUniformMatrix3x4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 992 */
-   void (GLAPIENTRYP ProgramUniformMatrix3x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 993 */
-   void (GLAPIENTRYP ProgramUniformMatrix4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 994 */
-   void (GLAPIENTRYP ProgramUniformMatrix4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 995 */
-   void (GLAPIENTRYP ProgramUniformMatrix4x2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 996 */
-   void (GLAPIENTRYP ProgramUniformMatrix4x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 997 */
-   void (GLAPIENTRYP ProgramUniformMatrix4x3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 998 */
-   void (GLAPIENTRYP ProgramUniformMatrix4x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 999 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 1000 */
-   void (GLAPIENTRYP UseProgramStages)(GLuint pipeline, GLbitfield stages, GLuint program); /* 1001 */
-   void (GLAPIENTRYP ValidateProgramPipeline)(GLuint pipeline); /* 1002 */
-   void (GLAPIENTRYP DebugMessageCallback)(GLDEBUGPROC callback, const GLvoid * userParam); /* 1003 */
-   void (GLAPIENTRYP DebugMessageControl)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 1004 */
-   void (GLAPIENTRYP DebugMessageInsert)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf); /* 1005 */
-   GLuint (GLAPIENTRYP GetDebugMessageLog)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLchar * messageLog); /* 1006 */
-   void (GLAPIENTRYP GetObjectLabel)(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei * length, GLchar * label); /* 1007 */
-   void (GLAPIENTRYP GetObjectPtrLabel)(const GLvoid * ptr, GLsizei bufSize, GLsizei * length, GLchar * label); /* 1008 */
-   void (GLAPIENTRYP ObjectLabel)(GLenum identifier, GLuint name, GLsizei length, const GLchar * label); /* 1009 */
-   void (GLAPIENTRYP ObjectPtrLabel)(const GLvoid * ptr, GLsizei length, const GLchar * label); /* 1010 */
-   void (GLAPIENTRYP PopDebugGroup)(void); /* 1011 */
-   void (GLAPIENTRYP PushDebugGroup)(GLenum source, GLuint id, GLsizei length, const GLchar * message); /* 1012 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 1013 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 1014 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount); /* 1015 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 1016 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 1017 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 1018 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1019 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 1020 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1021 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 1022 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 1023 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 1024 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 1025 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 1026 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 1027 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 1028 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 1029 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 1030 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 1031 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 1032 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 1033 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 1034 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 1035 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 1036 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 1037 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 1038 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 1039 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 1040 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 1041 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 1042 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 1043 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 1044 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 1045 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 1046 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 1047 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 1048 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 1049 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 1050 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 1051 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 1052 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 1053 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 1054 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 1055 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 1056 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 1057 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 1058 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 1059 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 1060 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 1061 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1062 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 1063 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1064 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 1065 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 1066 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 1067 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 1068 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 1069 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 1070 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1071 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1072 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1073 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1074 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1075 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1076 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1077 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1078 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1079 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1080 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1081 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1082 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 1083 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 1084 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 1085 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 1086 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 1087 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1088 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1089 */
-   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); /* 1090 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 1091 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 1092 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1093 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1094 */
-   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); /* 1095 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 1096 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 1097 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 1098 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 1099 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 1100 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 1101 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 1102 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 1103 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 1104 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 1105 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 1106 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1107 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 1108 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1109 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 1110 */
-   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 1111 */
-   void (GLAPIENTRYP GetTexGenxvOES)(GLenum coord, GLenum pname, GLfixed * params); /* 1112 */
-   void (GLAPIENTRYP TexGenxOES)(GLenum coord, GLenum pname, GLint param); /* 1113 */
-   void (GLAPIENTRYP TexGenxvOES)(GLenum coord, GLenum pname, const GLfixed * params); /* 1114 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 1115 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 1116 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 1117 */
-   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 1118 */
-   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 1119 */
-   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 1120 */
-   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 1121 */
-   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 1122 */
-   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 1123 */
-   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 1124 */
-   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 1125 */
-   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 1126 */
-   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 1127 */
-   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 1128 */
-   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 1129 */
-   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 1130 */
-   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 1131 */
-   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 1132 */
-   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 1133 */
-   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 1134 */
-   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 1135 */
-   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 1136 */
-   void (GLAPIENTRYP BeginPerfMonitorAMD)(GLuint monitor); /* 1137 */
-   void (GLAPIENTRYP DeletePerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1138 */
-   void (GLAPIENTRYP EndPerfMonitorAMD)(GLuint monitor); /* 1139 */
-   void (GLAPIENTRYP GenPerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1140 */
-   void (GLAPIENTRYP GetPerfMonitorCounterDataAMD)(GLuint monitor, GLenum pname, GLsizei dataSize, GLuint * data, GLint * bytesWritten); /* 1141 */
-   void (GLAPIENTRYP GetPerfMonitorCounterInfoAMD)(GLuint group, GLuint counter, GLenum pname, GLvoid * data); /* 1142 */
-   void (GLAPIENTRYP GetPerfMonitorCounterStringAMD)(GLuint group, GLuint counter, GLsizei bufSize, GLsizei * length, GLchar * counterString); /* 1143 */
-   void (GLAPIENTRYP GetPerfMonitorCountersAMD)(GLuint group, GLint * numCounters, GLint * maxActiveCounters, GLsizei countersSize, GLuint * counters); /* 1144 */
-   void (GLAPIENTRYP GetPerfMonitorGroupStringAMD)(GLuint group, GLsizei bufSize, GLsizei * length, GLchar * groupString); /* 1145 */
-   void (GLAPIENTRYP GetPerfMonitorGroupsAMD)(GLint * numGroups, GLsizei groupsSize, GLuint * groups); /* 1146 */
-   void (GLAPIENTRYP SelectPerfMonitorCountersAMD)(GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint * counterList); /* 1147 */
-   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 1148 */
-   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1149 */
-   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1150 */
-   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 1151 */
-   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 1152 */
-   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 1153 */
-   void (GLAPIENTRYP TextureBarrierNV)(void); /* 1154 */
-   void (GLAPIENTRYP VDPAUFiniNV)(void); /* 1155 */
-   void (GLAPIENTRYP VDPAUGetSurfaceivNV)(GLintptr surface, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 1156 */
-   void (GLAPIENTRYP VDPAUInitNV)(const GLvoid * vdpDevice, const GLvoid * getProcAddress); /* 1157 */
-   GLboolean (GLAPIENTRYP VDPAUIsSurfaceNV)(GLintptr surface); /* 1158 */
-   void (GLAPIENTRYP VDPAUMapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1159 */
-   GLintptr (GLAPIENTRYP VDPAURegisterOutputSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1160 */
-   GLintptr (GLAPIENTRYP VDPAURegisterVideoSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1161 */
-   void (GLAPIENTRYP VDPAUSurfaceAccessNV)(GLintptr surface, GLenum access); /* 1162 */
-   void (GLAPIENTRYP VDPAUUnmapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1163 */
-   void (GLAPIENTRYP VDPAUUnregisterSurfaceNV)(GLintptr surface); /* 1164 */
-   void (GLAPIENTRYP BeginPerfQueryINTEL)(GLuint queryHandle); /* 1165 */
-   void (GLAPIENTRYP CreatePerfQueryINTEL)(GLuint queryId, GLuint * queryHandle); /* 1166 */
-   void (GLAPIENTRYP DeletePerfQueryINTEL)(GLuint queryHandle); /* 1167 */
-   void (GLAPIENTRYP EndPerfQueryINTEL)(GLuint queryHandle); /* 1168 */
-   void (GLAPIENTRYP GetFirstPerfQueryIdINTEL)(GLuint * queryId); /* 1169 */
-   void (GLAPIENTRYP GetNextPerfQueryIdINTEL)(GLuint queryId, GLuint * nextQueryId); /* 1170 */
-   void (GLAPIENTRYP GetPerfCounterInfoINTEL)(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue); /* 1171 */
-   void (GLAPIENTRYP GetPerfQueryDataINTEL)(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten); /* 1172 */
-   void (GLAPIENTRYP GetPerfQueryIdByNameINTEL)(GLchar * queryName, GLuint * queryId); /* 1173 */
-   void (GLAPIENTRYP GetPerfQueryInfoINTEL)(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask); /* 1174 */
-   void (GLAPIENTRYP PolygonOffsetClampEXT)(GLfloat factor, GLfloat units, GLfloat clamp); /* 1175 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 1176 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1177 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1178 */
-   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 1179 */
-   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 1180 */
-   void (GLAPIENTRYP AlphaFuncx)(GLenum func, GLclampx ref); /* 1181 */
-   void (GLAPIENTRYP ClearColorx)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); /* 1182 */
-   void (GLAPIENTRYP ClearDepthx)(GLclampx depth); /* 1183 */
-   void (GLAPIENTRYP Color4x)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); /* 1184 */
-   void (GLAPIENTRYP DepthRangex)(GLclampx zNear, GLclampx zFar); /* 1185 */
-   void (GLAPIENTRYP Fogx)(GLenum pname, GLfixed param); /* 1186 */
-   void (GLAPIENTRYP Fogxv)(GLenum pname, const GLfixed * params); /* 1187 */
-   void (GLAPIENTRYP Frustumf)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1188 */
-   void (GLAPIENTRYP Frustumx)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1189 */
-   void (GLAPIENTRYP LightModelx)(GLenum pname, GLfixed param); /* 1190 */
-   void (GLAPIENTRYP LightModelxv)(GLenum pname, const GLfixed * params); /* 1191 */
-   void (GLAPIENTRYP Lightx)(GLenum light, GLenum pname, GLfixed param); /* 1192 */
-   void (GLAPIENTRYP Lightxv)(GLenum light, GLenum pname, const GLfixed * params); /* 1193 */
-   void (GLAPIENTRYP LineWidthx)(GLfixed width); /* 1194 */
-   void (GLAPIENTRYP LoadMatrixx)(const GLfixed * m); /* 1195 */
-   void (GLAPIENTRYP Materialx)(GLenum face, GLenum pname, GLfixed param); /* 1196 */
-   void (GLAPIENTRYP Materialxv)(GLenum face, GLenum pname, const GLfixed * params); /* 1197 */
-   void (GLAPIENTRYP MultMatrixx)(const GLfixed * m); /* 1198 */
-   void (GLAPIENTRYP MultiTexCoord4x)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); /* 1199 */
-   void (GLAPIENTRYP Normal3x)(GLfixed nx, GLfixed ny, GLfixed nz); /* 1200 */
-   void (GLAPIENTRYP Orthof)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1201 */
-   void (GLAPIENTRYP Orthox)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1202 */
-   void (GLAPIENTRYP PointSizex)(GLfixed size); /* 1203 */
-   void (GLAPIENTRYP PolygonOffsetx)(GLfixed factor, GLfixed units); /* 1204 */
-   void (GLAPIENTRYP Rotatex)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); /* 1205 */
-   void (GLAPIENTRYP SampleCoveragex)(GLclampx value, GLboolean invert); /* 1206 */
-   void (GLAPIENTRYP Scalex)(GLfixed x, GLfixed y, GLfixed z); /* 1207 */
-   void (GLAPIENTRYP TexEnvx)(GLenum target, GLenum pname, GLfixed param); /* 1208 */
-   void (GLAPIENTRYP TexEnvxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1209 */
-   void (GLAPIENTRYP TexParameterx)(GLenum target, GLenum pname, GLfixed param); /* 1210 */
-   void (GLAPIENTRYP Translatex)(GLfixed x, GLfixed y, GLfixed z); /* 1211 */
-   void (GLAPIENTRYP ClipPlanef)(GLenum plane, const GLfloat * equation); /* 1212 */
-   void (GLAPIENTRYP ClipPlanex)(GLenum plane, const GLfixed * equation); /* 1213 */
-   void (GLAPIENTRYP GetClipPlanef)(GLenum plane, GLfloat * equation); /* 1214 */
-   void (GLAPIENTRYP GetClipPlanex)(GLenum plane, GLfixed * equation); /* 1215 */
-   void (GLAPIENTRYP GetFixedv)(GLenum pname, GLfixed * params); /* 1216 */
-   void (GLAPIENTRYP GetLightxv)(GLenum light, GLenum pname, GLfixed * params); /* 1217 */
-   void (GLAPIENTRYP GetMaterialxv)(GLenum face, GLenum pname, GLfixed * params); /* 1218 */
-   void (GLAPIENTRYP GetTexEnvxv)(GLenum target, GLenum pname, GLfixed * params); /* 1219 */
-   void (GLAPIENTRYP GetTexParameterxv)(GLenum target, GLenum pname, GLfixed * params); /* 1220 */
-   void (GLAPIENTRYP PointParameterx)(GLenum pname, GLfixed param); /* 1221 */
-   void (GLAPIENTRYP PointParameterxv)(GLenum pname, const GLfixed * params); /* 1222 */
-   void (GLAPIENTRYP TexParameterxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1223 */
+   void (GLAPIENTRYP ClearNamedBufferData)(GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const GLvoid * data); /* 884 */
+   void (GLAPIENTRYP ClearNamedBufferSubData)(GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const GLvoid * data); /* 885 */
+   void (GLAPIENTRYP CompressedTextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 886 */
+   void (GLAPIENTRYP CompressedTextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 887 */
+   void (GLAPIENTRYP CompressedTextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 888 */
+   void (GLAPIENTRYP CopyNamedBufferSubData)(GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 889 */
+   void (GLAPIENTRYP CopyTextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); /* 890 */
+   void (GLAPIENTRYP CopyTextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 891 */
+   void (GLAPIENTRYP CopyTextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 892 */
+   void (GLAPIENTRYP CreateBuffers)(GLsizei n, GLuint * buffers); /* 893 */
+   void (GLAPIENTRYP CreateTextures)(GLenum target, GLsizei n, GLuint * textures); /* 894 */
+   void (GLAPIENTRYP FlushMappedNamedBufferRange)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 895 */
+   void (GLAPIENTRYP GenerateTextureMipmap)(GLuint texture); /* 896 */
+   void (GLAPIENTRYP GetCompressedTextureImage)(GLuint texture, GLint level, GLsizei bufSize, GLvoid * pixels); /* 897 */
+   void (GLAPIENTRYP GetNamedBufferParameteri64v)(GLuint buffer, GLenum pname, GLint64 * params); /* 898 */
+   void (GLAPIENTRYP GetNamedBufferParameteriv)(GLuint buffer, GLenum pname, GLint * params); /* 899 */
+   void (GLAPIENTRYP GetNamedBufferPointerv)(GLuint buffer, GLenum pname, GLvoid ** params); /* 900 */
+   void (GLAPIENTRYP GetNamedBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid * data); /* 901 */
+   void (GLAPIENTRYP GetTextureImage)(GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * pixels); /* 902 */
+   void (GLAPIENTRYP GetTextureLevelParameterfv)(GLuint texture, GLint level, GLenum pname, GLfloat * params); /* 903 */
+   void (GLAPIENTRYP GetTextureLevelParameteriv)(GLuint texture, GLint level, GLenum pname, GLint * params); /* 904 */
+   void (GLAPIENTRYP GetTextureParameterIiv)(GLuint texture, GLenum pname, GLint * params); /* 905 */
+   void (GLAPIENTRYP GetTextureParameterIuiv)(GLuint texture, GLenum pname, GLuint * params); /* 906 */
+   void (GLAPIENTRYP GetTextureParameterfv)(GLuint texture, GLenum pname, GLfloat * params); /* 907 */
+   void (GLAPIENTRYP GetTextureParameteriv)(GLuint texture, GLenum pname, GLint * params); /* 908 */
+   GLvoid * (GLAPIENTRYP MapNamedBuffer)(GLuint buffer, GLenum access); /* 909 */
+   GLvoid * (GLAPIENTRYP MapNamedBufferRange)(GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 910 */
+   void (GLAPIENTRYP NamedBufferData)(GLuint buffer, GLsizeiptr size, const GLvoid * data, GLenum usage); /* 911 */
+   void (GLAPIENTRYP NamedBufferStorage)(GLuint buffer, GLsizeiptr size, const GLvoid * data, GLbitfield flags); /* 912 */
+   void (GLAPIENTRYP NamedBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid * data); /* 913 */
+   void (GLAPIENTRYP TextureBuffer)(GLuint texture, GLenum internalformat, GLuint buffer); /* 914 */
+   void (GLAPIENTRYP TextureBufferRange)(GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 915 */
+   void (GLAPIENTRYP TextureParameterIiv)(GLuint texture, GLenum pname, const GLint * params); /* 916 */
+   void (GLAPIENTRYP TextureParameterIuiv)(GLuint texture, GLenum pname, const GLuint * params); /* 917 */
+   void (GLAPIENTRYP TextureParameterf)(GLuint texture, GLenum pname, GLfloat param); /* 918 */
+   void (GLAPIENTRYP TextureParameterfv)(GLuint texture, GLenum pname, const GLfloat * param); /* 919 */
+   void (GLAPIENTRYP TextureParameteri)(GLuint texture, GLenum pname, GLint param); /* 920 */
+   void (GLAPIENTRYP TextureParameteriv)(GLuint texture, GLenum pname, const GLint * param); /* 921 */
+   void (GLAPIENTRYP TextureStorage1D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width); /* 922 */
+   void (GLAPIENTRYP TextureStorage2D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); /* 923 */
+   void (GLAPIENTRYP TextureStorage2DMultisample)(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); /* 924 */
+   void (GLAPIENTRYP TextureStorage3D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); /* 925 */
+   void (GLAPIENTRYP TextureStorage3DMultisample)(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); /* 926 */
+   void (GLAPIENTRYP TextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels); /* 927 */
+   void (GLAPIENTRYP TextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels); /* 928 */
+   void (GLAPIENTRYP TextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels); /* 929 */
+   GLboolean (GLAPIENTRYP UnmapNamedBuffer)(GLuint buffer); /* 930 */
+   void (GLAPIENTRYP InvalidateBufferData)(GLuint buffer); /* 931 */
+   void (GLAPIENTRYP InvalidateBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 932 */
+   void (GLAPIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 933 */
+   void (GLAPIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height); /* 934 */
+   void (GLAPIENTRYP InvalidateTexImage)(GLuint texture, GLint level); /* 935 */
+   void (GLAPIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); /* 936 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 937 */
+   void (GLAPIENTRYP DrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); /* 938 */
+   void (GLAPIENTRYP DrawTexfvOES)(const GLfloat * coords); /* 939 */
+   void (GLAPIENTRYP DrawTexiOES)(GLint x, GLint y, GLint z, GLint width, GLint height); /* 940 */
+   void (GLAPIENTRYP DrawTexivOES)(const GLint * coords); /* 941 */
+   void (GLAPIENTRYP DrawTexsOES)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); /* 942 */
+   void (GLAPIENTRYP DrawTexsvOES)(const GLshort * coords); /* 943 */
+   void (GLAPIENTRYP DrawTexxOES)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); /* 944 */
+   void (GLAPIENTRYP DrawTexxvOES)(const GLfixed * coords); /* 945 */
+   void (GLAPIENTRYP PointSizePointerOES)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 946 */
+   GLbitfield (GLAPIENTRYP QueryMatrixxOES)(GLfixed * mantissa, GLint * exponent); /* 947 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 948 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 949 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 950 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 951 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 952 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 953 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 954 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 955 */
+   void (GLAPIENTRYP DiscardFramebufferEXT)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 956 */
+   void (GLAPIENTRYP ActiveShaderProgram)(GLuint pipeline, GLuint program); /* 957 */
+   void (GLAPIENTRYP BindProgramPipeline)(GLuint pipeline); /* 958 */
+   GLuint (GLAPIENTRYP CreateShaderProgramv)(GLenum type, GLsizei count, const GLchar * const * strings); /* 959 */
+   void (GLAPIENTRYP DeleteProgramPipelines)(GLsizei n, const GLuint * pipelines); /* 960 */
+   void (GLAPIENTRYP GenProgramPipelines)(GLsizei n, GLuint * pipelines); /* 961 */
+   void (GLAPIENTRYP GetProgramPipelineInfoLog)(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 962 */
+   void (GLAPIENTRYP GetProgramPipelineiv)(GLuint pipeline, GLenum pname, GLint * params); /* 963 */
+   GLboolean (GLAPIENTRYP IsProgramPipeline)(GLuint pipeline); /* 964 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 965 */
+   void (GLAPIENTRYP ProgramUniform1d)(GLuint program, GLint location, GLdouble x); /* 966 */
+   void (GLAPIENTRYP ProgramUniform1dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 967 */
+   void (GLAPIENTRYP ProgramUniform1f)(GLuint program, GLint location, GLfloat x); /* 968 */
+   void (GLAPIENTRYP ProgramUniform1fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 969 */
+   void (GLAPIENTRYP ProgramUniform1i)(GLuint program, GLint location, GLint x); /* 970 */
+   void (GLAPIENTRYP ProgramUniform1iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 971 */
+   void (GLAPIENTRYP ProgramUniform1ui)(GLuint program, GLint location, GLuint x); /* 972 */
+   void (GLAPIENTRYP ProgramUniform1uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 973 */
+   void (GLAPIENTRYP ProgramUniform2d)(GLuint program, GLint location, GLdouble x, GLdouble y); /* 974 */
+   void (GLAPIENTRYP ProgramUniform2dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 975 */
+   void (GLAPIENTRYP ProgramUniform2f)(GLuint program, GLint location, GLfloat x, GLfloat y); /* 976 */
+   void (GLAPIENTRYP ProgramUniform2fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 977 */
+   void (GLAPIENTRYP ProgramUniform2i)(GLuint program, GLint location, GLint x, GLint y); /* 978 */
+   void (GLAPIENTRYP ProgramUniform2iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 979 */
+   void (GLAPIENTRYP ProgramUniform2ui)(GLuint program, GLint location, GLuint x, GLuint y); /* 980 */
+   void (GLAPIENTRYP ProgramUniform2uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 981 */
+   void (GLAPIENTRYP ProgramUniform3d)(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); /* 982 */
+   void (GLAPIENTRYP ProgramUniform3dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 983 */
+   void (GLAPIENTRYP ProgramUniform3f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); /* 984 */
+   void (GLAPIENTRYP ProgramUniform3fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 985 */
+   void (GLAPIENTRYP ProgramUniform3i)(GLuint program, GLint location, GLint x, GLint y, GLint z); /* 986 */
+   void (GLAPIENTRYP ProgramUniform3iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 987 */
+   void (GLAPIENTRYP ProgramUniform3ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z); /* 988 */
+   void (GLAPIENTRYP ProgramUniform3uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 989 */
+   void (GLAPIENTRYP ProgramUniform4d)(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 990 */
+   void (GLAPIENTRYP ProgramUniform4dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 991 */
+   void (GLAPIENTRYP ProgramUniform4f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 992 */
+   void (GLAPIENTRYP ProgramUniform4fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 993 */
+   void (GLAPIENTRYP ProgramUniform4i)(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); /* 994 */
+   void (GLAPIENTRYP ProgramUniform4iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 995 */
+   void (GLAPIENTRYP ProgramUniform4ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 996 */
+   void (GLAPIENTRYP ProgramUniform4uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 997 */
+   void (GLAPIENTRYP ProgramUniformMatrix2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 998 */
+   void (GLAPIENTRYP ProgramUniformMatrix2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 999 */
+   void (GLAPIENTRYP ProgramUniformMatrix2x3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1000 */
+   void (GLAPIENTRYP ProgramUniformMatrix2x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1001 */
+   void (GLAPIENTRYP ProgramUniformMatrix2x4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1002 */
+   void (GLAPIENTRYP ProgramUniformMatrix2x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1003 */
+   void (GLAPIENTRYP ProgramUniformMatrix3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1004 */
+   void (GLAPIENTRYP ProgramUniformMatrix3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1005 */
+   void (GLAPIENTRYP ProgramUniformMatrix3x2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1006 */
+   void (GLAPIENTRYP ProgramUniformMatrix3x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1007 */
+   void (GLAPIENTRYP ProgramUniformMatrix3x4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1008 */
+   void (GLAPIENTRYP ProgramUniformMatrix3x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1009 */
+   void (GLAPIENTRYP ProgramUniformMatrix4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1010 */
+   void (GLAPIENTRYP ProgramUniformMatrix4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1011 */
+   void (GLAPIENTRYP ProgramUniformMatrix4x2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1012 */
+   void (GLAPIENTRYP ProgramUniformMatrix4x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1013 */
+   void (GLAPIENTRYP ProgramUniformMatrix4x3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1014 */
+   void (GLAPIENTRYP ProgramUniformMatrix4x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1015 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 1016 */
+   void (GLAPIENTRYP UseProgramStages)(GLuint pipeline, GLbitfield stages, GLuint program); /* 1017 */
+   void (GLAPIENTRYP ValidateProgramPipeline)(GLuint pipeline); /* 1018 */
+   void (GLAPIENTRYP DebugMessageCallback)(GLDEBUGPROC callback, const GLvoid * userParam); /* 1019 */
+   void (GLAPIENTRYP DebugMessageControl)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 1020 */
+   void (GLAPIENTRYP DebugMessageInsert)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf); /* 1021 */
+   GLuint (GLAPIENTRYP GetDebugMessageLog)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLchar * messageLog); /* 1022 */
+   void (GLAPIENTRYP GetObjectLabel)(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei * length, GLchar * label); /* 1023 */
+   void (GLAPIENTRYP GetObjectPtrLabel)(const GLvoid * ptr, GLsizei bufSize, GLsizei * length, GLchar * label); /* 1024 */
+   void (GLAPIENTRYP ObjectLabel)(GLenum identifier, GLuint name, GLsizei length, const GLchar * label); /* 1025 */
+   void (GLAPIENTRYP ObjectPtrLabel)(const GLvoid * ptr, GLsizei length, const GLchar * label); /* 1026 */
+   void (GLAPIENTRYP PopDebugGroup)(void); /* 1027 */
+   void (GLAPIENTRYP PushDebugGroup)(GLenum source, GLuint id, GLsizei length, const GLchar * message); /* 1028 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 1029 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 1030 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount); /* 1031 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 1032 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 1033 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 1034 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1035 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 1036 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1037 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 1038 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 1039 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 1040 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 1041 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 1042 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 1043 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 1044 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 1045 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 1046 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 1047 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 1048 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 1049 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 1050 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 1051 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 1052 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 1053 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 1054 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 1055 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 1056 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 1057 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 1058 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 1059 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 1060 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 1061 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 1062 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 1063 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 1064 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 1065 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 1066 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 1067 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 1068 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 1069 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 1070 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 1071 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 1072 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 1073 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 1074 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 1075 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 1076 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 1077 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1078 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 1079 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1080 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 1081 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 1082 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 1083 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 1084 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 1085 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 1086 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1087 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1088 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1089 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1090 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1091 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1092 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1093 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1094 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1095 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1096 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1097 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1098 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 1099 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 1100 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 1101 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 1102 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 1103 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1104 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1105 */
+   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); /* 1106 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 1107 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 1108 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1109 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1110 */
+   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); /* 1111 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 1112 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 1113 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 1114 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 1115 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 1116 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 1117 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 1118 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 1119 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 1120 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 1121 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 1122 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1123 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 1124 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1125 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 1126 */
+   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 1127 */
+   void (GLAPIENTRYP GetTexGenxvOES)(GLenum coord, GLenum pname, GLfixed * params); /* 1128 */
+   void (GLAPIENTRYP TexGenxOES)(GLenum coord, GLenum pname, GLint param); /* 1129 */
+   void (GLAPIENTRYP TexGenxvOES)(GLenum coord, GLenum pname, const GLfixed * params); /* 1130 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 1131 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 1132 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 1133 */
+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 1134 */
+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 1135 */
+   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 1136 */
+   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 1137 */
+   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 1138 */
+   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 1139 */
+   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 1140 */
+   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 1141 */
+   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 1142 */
+   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 1143 */
+   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 1144 */
+   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 1145 */
+   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 1146 */
+   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 1147 */
+   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 1148 */
+   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 1149 */
+   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 1150 */
+   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 1151 */
+   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 1152 */
+   void (GLAPIENTRYP BeginPerfMonitorAMD)(GLuint monitor); /* 1153 */
+   void (GLAPIENTRYP DeletePerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1154 */
+   void (GLAPIENTRYP EndPerfMonitorAMD)(GLuint monitor); /* 1155 */
+   void (GLAPIENTRYP GenPerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1156 */
+   void (GLAPIENTRYP GetPerfMonitorCounterDataAMD)(GLuint monitor, GLenum pname, GLsizei dataSize, GLuint * data, GLint * bytesWritten); /* 1157 */
+   void (GLAPIENTRYP GetPerfMonitorCounterInfoAMD)(GLuint group, GLuint counter, GLenum pname, GLvoid * data); /* 1158 */
+   void (GLAPIENTRYP GetPerfMonitorCounterStringAMD)(GLuint group, GLuint counter, GLsizei bufSize, GLsizei * length, GLchar * counterString); /* 1159 */
+   void (GLAPIENTRYP GetPerfMonitorCountersAMD)(GLuint group, GLint * numCounters, GLint * maxActiveCounters, GLsizei countersSize, GLuint * counters); /* 1160 */
+   void (GLAPIENTRYP GetPerfMonitorGroupStringAMD)(GLuint group, GLsizei bufSize, GLsizei * length, GLchar * groupString); /* 1161 */
+   void (GLAPIENTRYP GetPerfMonitorGroupsAMD)(GLint * numGroups, GLsizei groupsSize, GLuint * groups); /* 1162 */
+   void (GLAPIENTRYP SelectPerfMonitorCountersAMD)(GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint * counterList); /* 1163 */
+   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 1164 */
+   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1165 */
+   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1166 */
+   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 1167 */
+   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 1168 */
+   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 1169 */
+   void (GLAPIENTRYP TextureBarrierNV)(void); /* 1170 */
+   void (GLAPIENTRYP VDPAUFiniNV)(void); /* 1171 */
+   void (GLAPIENTRYP VDPAUGetSurfaceivNV)(GLintptr surface, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 1172 */
+   void (GLAPIENTRYP VDPAUInitNV)(const GLvoid * vdpDevice, const GLvoid * getProcAddress); /* 1173 */
+   GLboolean (GLAPIENTRYP VDPAUIsSurfaceNV)(GLintptr surface); /* 1174 */
+   void (GLAPIENTRYP VDPAUMapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1175 */
+   GLintptr (GLAPIENTRYP VDPAURegisterOutputSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1176 */
+   GLintptr (GLAPIENTRYP VDPAURegisterVideoSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1177 */
+   void (GLAPIENTRYP VDPAUSurfaceAccessNV)(GLintptr surface, GLenum access); /* 1178 */
+   void (GLAPIENTRYP VDPAUUnmapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1179 */
+   void (GLAPIENTRYP VDPAUUnregisterSurfaceNV)(GLintptr surface); /* 1180 */
+   void (GLAPIENTRYP BeginPerfQueryINTEL)(GLuint queryHandle); /* 1181 */
+   void (GLAPIENTRYP CreatePerfQueryINTEL)(GLuint queryId, GLuint * queryHandle); /* 1182 */
+   void (GLAPIENTRYP DeletePerfQueryINTEL)(GLuint queryHandle); /* 1183 */
+   void (GLAPIENTRYP EndPerfQueryINTEL)(GLuint queryHandle); /* 1184 */
+   void (GLAPIENTRYP GetFirstPerfQueryIdINTEL)(GLuint * queryId); /* 1185 */
+   void (GLAPIENTRYP GetNextPerfQueryIdINTEL)(GLuint queryId, GLuint * nextQueryId); /* 1186 */
+   void (GLAPIENTRYP GetPerfCounterInfoINTEL)(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue); /* 1187 */
+   void (GLAPIENTRYP GetPerfQueryDataINTEL)(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten); /* 1188 */
+   void (GLAPIENTRYP GetPerfQueryIdByNameINTEL)(GLchar * queryName, GLuint * queryId); /* 1189 */
+   void (GLAPIENTRYP GetPerfQueryInfoINTEL)(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask); /* 1190 */
+   void (GLAPIENTRYP PolygonOffsetClampEXT)(GLfloat factor, GLfloat units, GLfloat clamp); /* 1191 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 1192 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1193 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1194 */
+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 1195 */
+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 1196 */
+   void (GLAPIENTRYP AlphaFuncx)(GLenum func, GLclampx ref); /* 1197 */
+   void (GLAPIENTRYP ClearColorx)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); /* 1198 */
+   void (GLAPIENTRYP ClearDepthx)(GLclampx depth); /* 1199 */
+   void (GLAPIENTRYP Color4x)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); /* 1200 */
+   void (GLAPIENTRYP DepthRangex)(GLclampx zNear, GLclampx zFar); /* 1201 */
+   void (GLAPIENTRYP Fogx)(GLenum pname, GLfixed param); /* 1202 */
+   void (GLAPIENTRYP Fogxv)(GLenum pname, const GLfixed * params); /* 1203 */
+   void (GLAPIENTRYP Frustumf)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1204 */
+   void (GLAPIENTRYP Frustumx)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1205 */
+   void (GLAPIENTRYP LightModelx)(GLenum pname, GLfixed param); /* 1206 */
+   void (GLAPIENTRYP LightModelxv)(GLenum pname, const GLfixed * params); /* 1207 */
+   void (GLAPIENTRYP Lightx)(GLenum light, GLenum pname, GLfixed param); /* 1208 */
+   void (GLAPIENTRYP Lightxv)(GLenum light, GLenum pname, const GLfixed * params); /* 1209 */
+   void (GLAPIENTRYP LineWidthx)(GLfixed width); /* 1210 */
+   void (GLAPIENTRYP LoadMatrixx)(const GLfixed * m); /* 1211 */
+   void (GLAPIENTRYP Materialx)(GLenum face, GLenum pname, GLfixed param); /* 1212 */
+   void (GLAPIENTRYP Materialxv)(GLenum face, GLenum pname, const GLfixed * params); /* 1213 */
+   void (GLAPIENTRYP MultMatrixx)(const GLfixed * m); /* 1214 */
+   void (GLAPIENTRYP MultiTexCoord4x)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); /* 1215 */
+   void (GLAPIENTRYP Normal3x)(GLfixed nx, GLfixed ny, GLfixed nz); /* 1216 */
+   void (GLAPIENTRYP Orthof)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1217 */
+   void (GLAPIENTRYP Orthox)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1218 */
+   void (GLAPIENTRYP PointSizex)(GLfixed size); /* 1219 */
+   void (GLAPIENTRYP PolygonOffsetx)(GLfixed factor, GLfixed units); /* 1220 */
+   void (GLAPIENTRYP Rotatex)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); /* 1221 */
+   void (GLAPIENTRYP SampleCoveragex)(GLclampx value, GLboolean invert); /* 1222 */
+   void (GLAPIENTRYP Scalex)(GLfixed x, GLfixed y, GLfixed z); /* 1223 */
+   void (GLAPIENTRYP TexEnvx)(GLenum target, GLenum pname, GLfixed param); /* 1224 */
+   void (GLAPIENTRYP TexEnvxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1225 */
+   void (GLAPIENTRYP TexParameterx)(GLenum target, GLenum pname, GLfixed param); /* 1226 */
+   void (GLAPIENTRYP Translatex)(GLfixed x, GLfixed y, GLfixed z); /* 1227 */
+   void (GLAPIENTRYP ClipPlanef)(GLenum plane, const GLfloat * equation); /* 1228 */
+   void (GLAPIENTRYP ClipPlanex)(GLenum plane, const GLfixed * equation); /* 1229 */
+   void (GLAPIENTRYP GetClipPlanef)(GLenum plane, GLfloat * equation); /* 1230 */
+   void (GLAPIENTRYP GetClipPlanex)(GLenum plane, GLfixed * equation); /* 1231 */
+   void (GLAPIENTRYP GetFixedv)(GLenum pname, GLfixed * params); /* 1232 */
+   void (GLAPIENTRYP GetLightxv)(GLenum light, GLenum pname, GLfixed * params); /* 1233 */
+   void (GLAPIENTRYP GetMaterialxv)(GLenum face, GLenum pname, GLfixed * params); /* 1234 */
+   void (GLAPIENTRYP GetTexEnvxv)(GLenum target, GLenum pname, GLfixed * params); /* 1235 */
+   void (GLAPIENTRYP GetTexParameterxv)(GLenum target, GLenum pname, GLfixed * params); /* 1236 */
+   void (GLAPIENTRYP PointParameterx)(GLenum pname, GLfixed param); /* 1237 */
+   void (GLAPIENTRYP PointParameterxv)(GLenum pname, const GLfixed * params); /* 1238 */
+   void (GLAPIENTRYP TexParameterxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1239 */
 #endif /* !defined HAVE_SHARED_GLAPI */
 };
 
diff --git a/xorg-server/glx/glfunctions.h b/xorg-server/glx/glfunctions.h
index fa5080278..d7e412543 100644
--- a/xorg-server/glx/glfunctions.h
+++ b/xorg-server/glx/glfunctions.h
@@ -918,15 +918,24 @@
 #define glBindVertexBuffers(a1, a2, a3, a4, a5) CALL_BindVertexBuffers(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glClipControl(a1, a2) CALL_ClipControl(GET_DISPATCH(), (a1, a2))
 #define glBindTextureUnit(a1, a2) CALL_BindTextureUnit(GET_DISPATCH(), (a1, a2))
+#define glClearNamedBufferData(a1, a2, a3, a4, a5) CALL_ClearNamedBufferData(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glClearNamedBufferSubData(a1, a2, a3, a4, a5, a6, a7) CALL_ClearNamedBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
 #define glCompressedTextureSubImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_CompressedTextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
 #define glCompressedTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_CompressedTextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
 #define glCompressedTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_CompressedTextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11))
+#define glCopyNamedBufferSubData(a1, a2, a3, a4, a5) CALL_CopyNamedBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glCopyTextureSubImage1D(a1, a2, a3, a4, a5, a6) CALL_CopyTextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
 #define glCopyTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8) CALL_CopyTextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8))
 #define glCopyTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_CopyTextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
+#define glCreateBuffers(a1, a2) CALL_CreateBuffers(GET_DISPATCH(), (a1, a2))
 #define glCreateTextures(a1, a2, a3) CALL_CreateTextures(GET_DISPATCH(), (a1, a2, a3))
+#define glFlushMappedNamedBufferRange(a1, a2, a3) CALL_FlushMappedNamedBufferRange(GET_DISPATCH(), (a1, a2, a3))
 #define glGenerateTextureMipmap(a1) CALL_GenerateTextureMipmap(GET_DISPATCH(), (a1))
 #define glGetCompressedTextureImage(a1, a2, a3, a4) CALL_GetCompressedTextureImage(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetNamedBufferParameteri64v(a1, a2, a3) CALL_GetNamedBufferParameteri64v(GET_DISPATCH(), (a1, a2, a3))
+#define glGetNamedBufferParameteriv(a1, a2, a3) CALL_GetNamedBufferParameteriv(GET_DISPATCH(), (a1, a2, a3))
+#define glGetNamedBufferPointerv(a1, a2, a3) CALL_GetNamedBufferPointerv(GET_DISPATCH(), (a1, a2, a3))
+#define glGetNamedBufferSubData(a1, a2, a3, a4) CALL_GetNamedBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glGetTextureImage(a1, a2, a3, a4, a5, a6) CALL_GetTextureImage(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
 #define glGetTextureLevelParameterfv(a1, a2, a3, a4) CALL_GetTextureLevelParameterfv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glGetTextureLevelParameteriv(a1, a2, a3, a4) CALL_GetTextureLevelParameteriv(GET_DISPATCH(), (a1, a2, a3, a4))
@@ -934,7 +943,13 @@
 #define glGetTextureParameterIuiv(a1, a2, a3) CALL_GetTextureParameterIuiv(GET_DISPATCH(), (a1, a2, a3))
 #define glGetTextureParameterfv(a1, a2, a3) CALL_GetTextureParameterfv(GET_DISPATCH(), (a1, a2, a3))
 #define glGetTextureParameteriv(a1, a2, a3) CALL_GetTextureParameteriv(GET_DISPATCH(), (a1, a2, a3))
+#define glMapNamedBuffer(a1, a2) CALL_MapNamedBuffer(GET_DISPATCH(), (a1, a2))
+#define glMapNamedBufferRange(a1, a2, a3, a4) CALL_MapNamedBufferRange(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glNamedBufferData(a1, a2, a3, a4) CALL_NamedBufferData(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glNamedBufferStorage(a1, a2, a3, a4) CALL_NamedBufferStorage(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glNamedBufferSubData(a1, a2, a3, a4) CALL_NamedBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glTextureBuffer(a1, a2, a3) CALL_TextureBuffer(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureBufferRange(a1, a2, a3, a4, a5) CALL_TextureBufferRange(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glTextureParameterIiv(a1, a2, a3) CALL_TextureParameterIiv(GET_DISPATCH(), (a1, a2, a3))
 #define glTextureParameterIuiv(a1, a2, a3) CALL_TextureParameterIuiv(GET_DISPATCH(), (a1, a2, a3))
 #define glTextureParameterf(a1, a2, a3) CALL_TextureParameterf(GET_DISPATCH(), (a1, a2, a3))
@@ -949,6 +964,7 @@
 #define glTextureSubImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_TextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
 #define glTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_TextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
 #define glTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_TextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11))
+#define glUnmapNamedBuffer(a1) CALL_UnmapNamedBuffer(GET_DISPATCH(), (a1))
 #define glInvalidateBufferData(a1) CALL_InvalidateBufferData(GET_DISPATCH(), (a1))
 #define glInvalidateBufferSubData(a1, a2, a3) CALL_InvalidateBufferSubData(GET_DISPATCH(), (a1, a2, a3))
 #define glInvalidateFramebuffer(a1, a2, a3) CALL_InvalidateFramebuffer(GET_DISPATCH(), (a1, a2, a3))
diff --git a/xorg-server/glx/glprocs.h b/xorg-server/glx/glprocs.h
index 5aa1cb8ad..b849807c2 100644
--- a/xorg-server/glx/glprocs.h
+++ b/xorg-server/glx/glprocs.h
@@ -936,15 +936,24 @@ static const char gl_string_table[] =
     "glBindVertexBuffers\0"
     "glClipControl\0"
     "glBindTextureUnit\0"
+    "glClearNamedBufferData\0"
+    "glClearNamedBufferSubData\0"
     "glCompressedTextureSubImage1D\0"
     "glCompressedTextureSubImage2D\0"
     "glCompressedTextureSubImage3D\0"
+    "glCopyNamedBufferSubData\0"
     "glCopyTextureSubImage1D\0"
     "glCopyTextureSubImage2D\0"
     "glCopyTextureSubImage3D\0"
+    "glCreateBuffers\0"
     "glCreateTextures\0"
+    "glFlushMappedNamedBufferRange\0"
     "glGenerateTextureMipmap\0"
     "glGetCompressedTextureImage\0"
+    "glGetNamedBufferParameteri64v\0"
+    "glGetNamedBufferParameteriv\0"
+    "glGetNamedBufferPointerv\0"
+    "glGetNamedBufferSubData\0"
     "glGetTextureImage\0"
     "glGetTextureLevelParameterfv\0"
     "glGetTextureLevelParameteriv\0"
@@ -952,7 +961,13 @@ static const char gl_string_table[] =
     "glGetTextureParameterIuiv\0"
     "glGetTextureParameterfv\0"
     "glGetTextureParameteriv\0"
+    "glMapNamedBuffer\0"
+    "glMapNamedBufferRange\0"
+    "glNamedBufferData\0"
+    "glNamedBufferStorage\0"
+    "glNamedBufferSubData\0"
     "glTextureBuffer\0"
+    "glTextureBufferRange\0"
     "glTextureParameterIiv\0"
     "glTextureParameterIuiv\0"
     "glTextureParameterf\0"
@@ -967,6 +982,7 @@ static const char gl_string_table[] =
     "glTextureSubImage1D\0"
     "glTextureSubImage2D\0"
     "glTextureSubImage3D\0"
+    "glUnmapNamedBuffer\0"
     "glInvalidateBufferData\0"
     "glInvalidateBufferSubData\0"
     "glInvalidateFramebuffer\0"
@@ -1809,32 +1825,17 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_732 mgl_dispatch_stub_732
 #define gl_dispatch_stub_733 mgl_dispatch_stub_733
 #define gl_dispatch_stub_846 mgl_dispatch_stub_846
-#define gl_dispatch_stub_922 mgl_dispatch_stub_922
-#define gl_dispatch_stub_923 mgl_dispatch_stub_923
-#define gl_dispatch_stub_924 mgl_dispatch_stub_924
-#define gl_dispatch_stub_925 mgl_dispatch_stub_925
-#define gl_dispatch_stub_926 mgl_dispatch_stub_926
-#define gl_dispatch_stub_927 mgl_dispatch_stub_927
-#define gl_dispatch_stub_928 mgl_dispatch_stub_928
-#define gl_dispatch_stub_929 mgl_dispatch_stub_929
-#define gl_dispatch_stub_931 mgl_dispatch_stub_931
-#define gl_dispatch_stub_932 mgl_dispatch_stub_932
-#define gl_dispatch_stub_933 mgl_dispatch_stub_933
+#define gl_dispatch_stub_938 mgl_dispatch_stub_938
+#define gl_dispatch_stub_939 mgl_dispatch_stub_939
 #define gl_dispatch_stub_940 mgl_dispatch_stub_940
 #define gl_dispatch_stub_941 mgl_dispatch_stub_941
 #define gl_dispatch_stub_942 mgl_dispatch_stub_942
 #define gl_dispatch_stub_943 mgl_dispatch_stub_943
 #define gl_dispatch_stub_944 mgl_dispatch_stub_944
 #define gl_dispatch_stub_945 mgl_dispatch_stub_945
-#define gl_dispatch_stub_946 mgl_dispatch_stub_946
 #define gl_dispatch_stub_947 mgl_dispatch_stub_947
 #define gl_dispatch_stub_948 mgl_dispatch_stub_948
-#define gl_dispatch_stub_950 mgl_dispatch_stub_950
-#define gl_dispatch_stub_951 mgl_dispatch_stub_951
-#define gl_dispatch_stub_952 mgl_dispatch_stub_952
-#define gl_dispatch_stub_953 mgl_dispatch_stub_953
-#define gl_dispatch_stub_954 mgl_dispatch_stub_954
-#define gl_dispatch_stub_955 mgl_dispatch_stub_955
+#define gl_dispatch_stub_949 mgl_dispatch_stub_949
 #define gl_dispatch_stub_956 mgl_dispatch_stub_956
 #define gl_dispatch_stub_957 mgl_dispatch_stub_957
 #define gl_dispatch_stub_958 mgl_dispatch_stub_958
@@ -1844,7 +1845,6 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_962 mgl_dispatch_stub_962
 #define gl_dispatch_stub_963 mgl_dispatch_stub_963
 #define gl_dispatch_stub_964 mgl_dispatch_stub_964
-#define gl_dispatch_stub_965 mgl_dispatch_stub_965
 #define gl_dispatch_stub_966 mgl_dispatch_stub_966
 #define gl_dispatch_stub_967 mgl_dispatch_stub_967
 #define gl_dispatch_stub_968 mgl_dispatch_stub_968
@@ -1879,32 +1879,48 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_997 mgl_dispatch_stub_997
 #define gl_dispatch_stub_998 mgl_dispatch_stub_998
 #define gl_dispatch_stub_999 mgl_dispatch_stub_999
+#define gl_dispatch_stub_1000 mgl_dispatch_stub_1000
 #define gl_dispatch_stub_1001 mgl_dispatch_stub_1001
 #define gl_dispatch_stub_1002 mgl_dispatch_stub_1002
-#define gl_dispatch_stub_1027 mgl_dispatch_stub_1027
-#define gl_dispatch_stub_1028 mgl_dispatch_stub_1028
-#define gl_dispatch_stub_1102 mgl_dispatch_stub_1102
-#define gl_dispatch_stub_1103 mgl_dispatch_stub_1103
-#define gl_dispatch_stub_1104 mgl_dispatch_stub_1104
-#define gl_dispatch_stub_1112 mgl_dispatch_stub_1112
-#define gl_dispatch_stub_1113 mgl_dispatch_stub_1113
-#define gl_dispatch_stub_1114 mgl_dispatch_stub_1114
-#define gl_dispatch_stub_1115 mgl_dispatch_stub_1115
+#define gl_dispatch_stub_1003 mgl_dispatch_stub_1003
+#define gl_dispatch_stub_1004 mgl_dispatch_stub_1004
+#define gl_dispatch_stub_1005 mgl_dispatch_stub_1005
+#define gl_dispatch_stub_1006 mgl_dispatch_stub_1006
+#define gl_dispatch_stub_1007 mgl_dispatch_stub_1007
+#define gl_dispatch_stub_1008 mgl_dispatch_stub_1008
+#define gl_dispatch_stub_1009 mgl_dispatch_stub_1009
+#define gl_dispatch_stub_1010 mgl_dispatch_stub_1010
+#define gl_dispatch_stub_1011 mgl_dispatch_stub_1011
+#define gl_dispatch_stub_1012 mgl_dispatch_stub_1012
+#define gl_dispatch_stub_1013 mgl_dispatch_stub_1013
+#define gl_dispatch_stub_1014 mgl_dispatch_stub_1014
+#define gl_dispatch_stub_1015 mgl_dispatch_stub_1015
+#define gl_dispatch_stub_1017 mgl_dispatch_stub_1017
+#define gl_dispatch_stub_1018 mgl_dispatch_stub_1018
+#define gl_dispatch_stub_1043 mgl_dispatch_stub_1043
+#define gl_dispatch_stub_1044 mgl_dispatch_stub_1044
 #define gl_dispatch_stub_1118 mgl_dispatch_stub_1118
 #define gl_dispatch_stub_1119 mgl_dispatch_stub_1119
-#define gl_dispatch_stub_1165 mgl_dispatch_stub_1165
-#define gl_dispatch_stub_1166 mgl_dispatch_stub_1166
-#define gl_dispatch_stub_1167 mgl_dispatch_stub_1167
-#define gl_dispatch_stub_1168 mgl_dispatch_stub_1168
-#define gl_dispatch_stub_1169 mgl_dispatch_stub_1169
-#define gl_dispatch_stub_1170 mgl_dispatch_stub_1170
-#define gl_dispatch_stub_1171 mgl_dispatch_stub_1171
-#define gl_dispatch_stub_1172 mgl_dispatch_stub_1172
-#define gl_dispatch_stub_1173 mgl_dispatch_stub_1173
-#define gl_dispatch_stub_1174 mgl_dispatch_stub_1174
-#define gl_dispatch_stub_1176 mgl_dispatch_stub_1176
-#define gl_dispatch_stub_1177 mgl_dispatch_stub_1177
-#define gl_dispatch_stub_1178 mgl_dispatch_stub_1178
+#define gl_dispatch_stub_1120 mgl_dispatch_stub_1120
+#define gl_dispatch_stub_1128 mgl_dispatch_stub_1128
+#define gl_dispatch_stub_1129 mgl_dispatch_stub_1129
+#define gl_dispatch_stub_1130 mgl_dispatch_stub_1130
+#define gl_dispatch_stub_1131 mgl_dispatch_stub_1131
+#define gl_dispatch_stub_1134 mgl_dispatch_stub_1134
+#define gl_dispatch_stub_1135 mgl_dispatch_stub_1135
+#define gl_dispatch_stub_1181 mgl_dispatch_stub_1181
+#define gl_dispatch_stub_1182 mgl_dispatch_stub_1182
+#define gl_dispatch_stub_1183 mgl_dispatch_stub_1183
+#define gl_dispatch_stub_1184 mgl_dispatch_stub_1184
+#define gl_dispatch_stub_1185 mgl_dispatch_stub_1185
+#define gl_dispatch_stub_1186 mgl_dispatch_stub_1186
+#define gl_dispatch_stub_1187 mgl_dispatch_stub_1187
+#define gl_dispatch_stub_1188 mgl_dispatch_stub_1188
+#define gl_dispatch_stub_1189 mgl_dispatch_stub_1189
+#define gl_dispatch_stub_1190 mgl_dispatch_stub_1190
+#define gl_dispatch_stub_1192 mgl_dispatch_stub_1192
+#define gl_dispatch_stub_1193 mgl_dispatch_stub_1193
+#define gl_dispatch_stub_1194 mgl_dispatch_stub_1194
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1926,102 +1942,102 @@ void GLAPIENTRY gl_dispatch_stub_731(GLuint id, GLenum pname, GLint64 * params);
 void GLAPIENTRY gl_dispatch_stub_732(GLuint id, GLenum pname, GLuint64 * params);
 void GLAPIENTRY gl_dispatch_stub_733(GLuint id, GLenum target);
 void GLAPIENTRY gl_dispatch_stub_846(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_922(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-void GLAPIENTRY gl_dispatch_stub_923(const GLfloat * coords);
-void GLAPIENTRY gl_dispatch_stub_924(GLint x, GLint y, GLint z, GLint width, GLint height);
-void GLAPIENTRY gl_dispatch_stub_925(const GLint * coords);
-void GLAPIENTRY gl_dispatch_stub_926(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-void GLAPIENTRY gl_dispatch_stub_927(const GLshort * coords);
-void GLAPIENTRY gl_dispatch_stub_928(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
-void GLAPIENTRY gl_dispatch_stub_929(const GLfixed * coords);
-GLbitfield GLAPIENTRY gl_dispatch_stub_931(GLfixed * mantissa, GLint * exponent);
-void GLAPIENTRY gl_dispatch_stub_932(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_933(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_940(GLenum target, GLsizei numAttachments, const GLenum * attachments);
-void GLAPIENTRY gl_dispatch_stub_941(GLuint pipeline, GLuint program);
-void GLAPIENTRY gl_dispatch_stub_942(GLuint pipeline);
-GLuint GLAPIENTRY gl_dispatch_stub_943(GLenum type, GLsizei count, const GLchar * const * strings);
-void GLAPIENTRY gl_dispatch_stub_944(GLsizei n, const GLuint * pipelines);
-void GLAPIENTRY gl_dispatch_stub_945(GLsizei n, GLuint * pipelines);
-void GLAPIENTRY gl_dispatch_stub_946(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog);
-void GLAPIENTRY gl_dispatch_stub_947(GLuint pipeline, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_948(GLuint pipeline);
-void GLAPIENTRY gl_dispatch_stub_950(GLuint program, GLint location, GLdouble x);
-void GLAPIENTRY gl_dispatch_stub_951(GLuint program, GLint location, GLsizei count, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_952(GLuint program, GLint location, GLfloat x);
-void GLAPIENTRY gl_dispatch_stub_953(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_954(GLuint program, GLint location, GLint x);
-void GLAPIENTRY gl_dispatch_stub_955(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_956(GLuint program, GLint location, GLuint x);
-void GLAPIENTRY gl_dispatch_stub_957(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_958(GLuint program, GLint location, GLdouble x, GLdouble y);
-void GLAPIENTRY gl_dispatch_stub_959(GLuint program, GLint location, GLsizei count, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_960(GLuint program, GLint location, GLfloat x, GLfloat y);
-void GLAPIENTRY gl_dispatch_stub_961(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_962(GLuint program, GLint location, GLint x, GLint y);
-void GLAPIENTRY gl_dispatch_stub_963(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_964(GLuint program, GLint location, GLuint x, GLuint y);
-void GLAPIENTRY gl_dispatch_stub_965(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_966(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+void GLAPIENTRY gl_dispatch_stub_938(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+void GLAPIENTRY gl_dispatch_stub_939(const GLfloat * coords);
+void GLAPIENTRY gl_dispatch_stub_940(GLint x, GLint y, GLint z, GLint width, GLint height);
+void GLAPIENTRY gl_dispatch_stub_941(const GLint * coords);
+void GLAPIENTRY gl_dispatch_stub_942(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+void GLAPIENTRY gl_dispatch_stub_943(const GLshort * coords);
+void GLAPIENTRY gl_dispatch_stub_944(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
+void GLAPIENTRY gl_dispatch_stub_945(const GLfixed * coords);
+GLbitfield GLAPIENTRY gl_dispatch_stub_947(GLfixed * mantissa, GLint * exponent);
+void GLAPIENTRY gl_dispatch_stub_948(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_949(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_956(GLenum target, GLsizei numAttachments, const GLenum * attachments);
+void GLAPIENTRY gl_dispatch_stub_957(GLuint pipeline, GLuint program);
+void GLAPIENTRY gl_dispatch_stub_958(GLuint pipeline);
+GLuint GLAPIENTRY gl_dispatch_stub_959(GLenum type, GLsizei count, const GLchar * const * strings);
+void GLAPIENTRY gl_dispatch_stub_960(GLsizei n, const GLuint * pipelines);
+void GLAPIENTRY gl_dispatch_stub_961(GLsizei n, GLuint * pipelines);
+void GLAPIENTRY gl_dispatch_stub_962(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog);
+void GLAPIENTRY gl_dispatch_stub_963(GLuint pipeline, GLenum pname, GLint * params);
+GLboolean GLAPIENTRY gl_dispatch_stub_964(GLuint pipeline);
+void GLAPIENTRY gl_dispatch_stub_966(GLuint program, GLint location, GLdouble x);
 void GLAPIENTRY gl_dispatch_stub_967(GLuint program, GLint location, GLsizei count, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_968(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
+void GLAPIENTRY gl_dispatch_stub_968(GLuint program, GLint location, GLfloat x);
 void GLAPIENTRY gl_dispatch_stub_969(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_970(GLuint program, GLint location, GLint x, GLint y, GLint z);
+void GLAPIENTRY gl_dispatch_stub_970(GLuint program, GLint location, GLint x);
 void GLAPIENTRY gl_dispatch_stub_971(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_972(GLuint program, GLint location, GLuint x, GLuint y, GLuint z);
+void GLAPIENTRY gl_dispatch_stub_972(GLuint program, GLint location, GLuint x);
 void GLAPIENTRY gl_dispatch_stub_973(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_974(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+void GLAPIENTRY gl_dispatch_stub_974(GLuint program, GLint location, GLdouble x, GLdouble y);
 void GLAPIENTRY gl_dispatch_stub_975(GLuint program, GLint location, GLsizei count, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_976(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+void GLAPIENTRY gl_dispatch_stub_976(GLuint program, GLint location, GLfloat x, GLfloat y);
 void GLAPIENTRY gl_dispatch_stub_977(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_978(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
+void GLAPIENTRY gl_dispatch_stub_978(GLuint program, GLint location, GLint x, GLint y);
 void GLAPIENTRY gl_dispatch_stub_979(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_980(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w);
+void GLAPIENTRY gl_dispatch_stub_980(GLuint program, GLint location, GLuint x, GLuint y);
 void GLAPIENTRY gl_dispatch_stub_981(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_982(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_983(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_984(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_985(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_986(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_987(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_988(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_989(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_990(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_991(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_992(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_993(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_994(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_995(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_996(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_997(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_982(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+void GLAPIENTRY gl_dispatch_stub_983(GLuint program, GLint location, GLsizei count, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_984(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
+void GLAPIENTRY gl_dispatch_stub_985(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_986(GLuint program, GLint location, GLint x, GLint y, GLint z);
+void GLAPIENTRY gl_dispatch_stub_987(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_988(GLuint program, GLint location, GLuint x, GLuint y, GLuint z);
+void GLAPIENTRY gl_dispatch_stub_989(GLuint program, GLint location, GLsizei count, const GLuint * value);
+void GLAPIENTRY gl_dispatch_stub_990(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+void GLAPIENTRY gl_dispatch_stub_991(GLuint program, GLint location, GLsizei count, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_992(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+void GLAPIENTRY gl_dispatch_stub_993(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_994(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
+void GLAPIENTRY gl_dispatch_stub_995(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_996(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w);
+void GLAPIENTRY gl_dispatch_stub_997(GLuint program, GLint location, GLsizei count, const GLuint * value);
 void GLAPIENTRY gl_dispatch_stub_998(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
 void GLAPIENTRY gl_dispatch_stub_999(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_1001(GLuint pipeline, GLbitfield stages, GLuint program);
-void GLAPIENTRY gl_dispatch_stub_1002(GLuint pipeline);
-void GLAPIENTRY gl_dispatch_stub_1027(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_1028(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_1102(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_1103(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_1104(GLsizei n, GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_1112(GLenum coord, GLenum pname, GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1113(GLenum coord, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_1114(GLenum coord, GLenum pname, const GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1115(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_1118(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_1119(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_1165(GLuint queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1166(GLuint queryId, GLuint * queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1167(GLuint queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1168(GLuint queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1169(GLuint * queryId);
-void GLAPIENTRY gl_dispatch_stub_1170(GLuint queryId, GLuint * nextQueryId);
-void GLAPIENTRY gl_dispatch_stub_1171(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue);
-void GLAPIENTRY gl_dispatch_stub_1172(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten);
-void GLAPIENTRY gl_dispatch_stub_1173(GLchar * queryName, GLuint * queryId);
-void GLAPIENTRY gl_dispatch_stub_1174(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask);
-void GLAPIENTRY gl_dispatch_stub_1176(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_1177(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_1178(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_1000(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1001(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1002(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1003(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1004(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1005(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1006(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1007(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1008(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1009(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1010(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1011(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1012(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1013(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1014(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1015(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1017(GLuint pipeline, GLbitfield stages, GLuint program);
+void GLAPIENTRY gl_dispatch_stub_1018(GLuint pipeline);
+void GLAPIENTRY gl_dispatch_stub_1043(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_1044(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_1118(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_1119(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_1120(GLsizei n, GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_1128(GLenum coord, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1129(GLenum coord, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_1130(GLenum coord, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1131(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_1134(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_1135(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_1181(GLuint queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1182(GLuint queryId, GLuint * queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1183(GLuint queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1184(GLuint queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1185(GLuint * queryId);
+void GLAPIENTRY gl_dispatch_stub_1186(GLuint queryId, GLuint * nextQueryId);
+void GLAPIENTRY gl_dispatch_stub_1187(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue);
+void GLAPIENTRY gl_dispatch_stub_1188(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten);
+void GLAPIENTRY gl_dispatch_stub_1189(GLchar * queryName, GLuint * queryId);
+void GLAPIENTRY gl_dispatch_stub_1190(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask);
+void GLAPIENTRY gl_dispatch_stub_1192(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_1193(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_1194(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -2909,858 +2925,874 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(14804, glBindVertexBuffers, glBindVertexBuffers, NULL, 881),
     NAME_FUNC_OFFSET(14824, glClipControl, glClipControl, NULL, 882),
     NAME_FUNC_OFFSET(14838, glBindTextureUnit, glBindTextureUnit, NULL, 883),
-    NAME_FUNC_OFFSET(14856, glCompressedTextureSubImage1D, glCompressedTextureSubImage1D, NULL, 884),
-    NAME_FUNC_OFFSET(14886, glCompressedTextureSubImage2D, glCompressedTextureSubImage2D, NULL, 885),
-    NAME_FUNC_OFFSET(14916, glCompressedTextureSubImage3D, glCompressedTextureSubImage3D, NULL, 886),
-    NAME_FUNC_OFFSET(14946, glCopyTextureSubImage1D, glCopyTextureSubImage1D, NULL, 887),
-    NAME_FUNC_OFFSET(14970, glCopyTextureSubImage2D, glCopyTextureSubImage2D, NULL, 888),
-    NAME_FUNC_OFFSET(14994, glCopyTextureSubImage3D, glCopyTextureSubImage3D, NULL, 889),
-    NAME_FUNC_OFFSET(15018, glCreateTextures, glCreateTextures, NULL, 890),
-    NAME_FUNC_OFFSET(15035, glGenerateTextureMipmap, glGenerateTextureMipmap, NULL, 891),
-    NAME_FUNC_OFFSET(15059, glGetCompressedTextureImage, glGetCompressedTextureImage, NULL, 892),
-    NAME_FUNC_OFFSET(15087, glGetTextureImage, glGetTextureImage, NULL, 893),
-    NAME_FUNC_OFFSET(15105, glGetTextureLevelParameterfv, glGetTextureLevelParameterfv, NULL, 894),
-    NAME_FUNC_OFFSET(15134, glGetTextureLevelParameteriv, glGetTextureLevelParameteriv, NULL, 895),
-    NAME_FUNC_OFFSET(15163, glGetTextureParameterIiv, glGetTextureParameterIiv, NULL, 896),
-    NAME_FUNC_OFFSET(15188, glGetTextureParameterIuiv, glGetTextureParameterIuiv, NULL, 897),
-    NAME_FUNC_OFFSET(15214, glGetTextureParameterfv, glGetTextureParameterfv, NULL, 898),
-    NAME_FUNC_OFFSET(15238, glGetTextureParameteriv, glGetTextureParameteriv, NULL, 899),
-    NAME_FUNC_OFFSET(15262, glTextureBuffer, glTextureBuffer, NULL, 900),
-    NAME_FUNC_OFFSET(15278, glTextureParameterIiv, glTextureParameterIiv, NULL, 901),
-    NAME_FUNC_OFFSET(15300, glTextureParameterIuiv, glTextureParameterIuiv, NULL, 902),
-    NAME_FUNC_OFFSET(15323, glTextureParameterf, glTextureParameterf, NULL, 903),
-    NAME_FUNC_OFFSET(15343, glTextureParameterfv, glTextureParameterfv, NULL, 904),
-    NAME_FUNC_OFFSET(15364, glTextureParameteri, glTextureParameteri, NULL, 905),
-    NAME_FUNC_OFFSET(15384, glTextureParameteriv, glTextureParameteriv, NULL, 906),
-    NAME_FUNC_OFFSET(15405, glTextureStorage1D, glTextureStorage1D, NULL, 907),
-    NAME_FUNC_OFFSET(15424, glTextureStorage2D, glTextureStorage2D, NULL, 908),
-    NAME_FUNC_OFFSET(15443, glTextureStorage2DMultisample, glTextureStorage2DMultisample, NULL, 909),
-    NAME_FUNC_OFFSET(15473, glTextureStorage3D, glTextureStorage3D, NULL, 910),
-    NAME_FUNC_OFFSET(15492, glTextureStorage3DMultisample, glTextureStorage3DMultisample, NULL, 911),
-    NAME_FUNC_OFFSET(15522, glTextureSubImage1D, glTextureSubImage1D, NULL, 912),
-    NAME_FUNC_OFFSET(15542, glTextureSubImage2D, glTextureSubImage2D, NULL, 913),
-    NAME_FUNC_OFFSET(15562, glTextureSubImage3D, glTextureSubImage3D, NULL, 914),
-    NAME_FUNC_OFFSET(15582, glInvalidateBufferData, glInvalidateBufferData, NULL, 915),
-    NAME_FUNC_OFFSET(15605, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 916),
-    NAME_FUNC_OFFSET(15631, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 917),
-    NAME_FUNC_OFFSET(15655, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 918),
-    NAME_FUNC_OFFSET(15682, glInvalidateTexImage, glInvalidateTexImage, NULL, 919),
-    NAME_FUNC_OFFSET(15703, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 920),
-    NAME_FUNC_OFFSET(15727, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 921),
-    NAME_FUNC_OFFSET(15746, gl_dispatch_stub_922, gl_dispatch_stub_922, NULL, 922),
-    NAME_FUNC_OFFSET(15760, gl_dispatch_stub_923, gl_dispatch_stub_923, NULL, 923),
-    NAME_FUNC_OFFSET(15775, gl_dispatch_stub_924, gl_dispatch_stub_924, NULL, 924),
-    NAME_FUNC_OFFSET(15789, gl_dispatch_stub_925, gl_dispatch_stub_925, NULL, 925),
-    NAME_FUNC_OFFSET(15804, gl_dispatch_stub_926, gl_dispatch_stub_926, NULL, 926),
-    NAME_FUNC_OFFSET(15818, gl_dispatch_stub_927, gl_dispatch_stub_927, NULL, 927),
-    NAME_FUNC_OFFSET(15833, gl_dispatch_stub_928, gl_dispatch_stub_928, NULL, 928),
-    NAME_FUNC_OFFSET(15847, gl_dispatch_stub_929, gl_dispatch_stub_929, NULL, 929),
-    NAME_FUNC_OFFSET(15862, glPointSizePointerOES, glPointSizePointerOES, NULL, 930),
-    NAME_FUNC_OFFSET(15884, gl_dispatch_stub_931, gl_dispatch_stub_931, NULL, 931),
-    NAME_FUNC_OFFSET(15902, gl_dispatch_stub_932, gl_dispatch_stub_932, NULL, 932),
-    NAME_FUNC_OFFSET(15919, gl_dispatch_stub_933, gl_dispatch_stub_933, NULL, 933),
-    NAME_FUNC_OFFSET(15939, glColorPointerEXT, glColorPointerEXT, NULL, 934),
-    NAME_FUNC_OFFSET(15957, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 935),
-    NAME_FUNC_OFFSET(15978, glIndexPointerEXT, glIndexPointerEXT, NULL, 936),
-    NAME_FUNC_OFFSET(15996, glNormalPointerEXT, glNormalPointerEXT, NULL, 937),
-    NAME_FUNC_OFFSET(16015, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 938),
-    NAME_FUNC_OFFSET(16036, glVertexPointerEXT, glVertexPointerEXT, NULL, 939),
-    NAME_FUNC_OFFSET(16055, gl_dispatch_stub_940, gl_dispatch_stub_940, NULL, 940),
-    NAME_FUNC_OFFSET(16079, gl_dispatch_stub_941, gl_dispatch_stub_941, NULL, 941),
-    NAME_FUNC_OFFSET(16101, gl_dispatch_stub_942, gl_dispatch_stub_942, NULL, 942),
-    NAME_FUNC_OFFSET(16123, gl_dispatch_stub_943, gl_dispatch_stub_943, NULL, 943),
-    NAME_FUNC_OFFSET(16146, gl_dispatch_stub_944, gl_dispatch_stub_944, NULL, 944),
-    NAME_FUNC_OFFSET(16171, gl_dispatch_stub_945, gl_dispatch_stub_945, NULL, 945),
-    NAME_FUNC_OFFSET(16193, gl_dispatch_stub_946, gl_dispatch_stub_946, NULL, 946),
-    NAME_FUNC_OFFSET(16221, gl_dispatch_stub_947, gl_dispatch_stub_947, NULL, 947),
-    NAME_FUNC_OFFSET(16244, gl_dispatch_stub_948, gl_dispatch_stub_948, NULL, 948),
-    NAME_FUNC_OFFSET(16264, glLockArraysEXT, glLockArraysEXT, NULL, 949),
-    NAME_FUNC_OFFSET(16280, gl_dispatch_stub_950, gl_dispatch_stub_950, NULL, 950),
-    NAME_FUNC_OFFSET(16299, gl_dispatch_stub_951, gl_dispatch_stub_951, NULL, 951),
-    NAME_FUNC_OFFSET(16319, gl_dispatch_stub_952, gl_dispatch_stub_952, NULL, 952),
-    NAME_FUNC_OFFSET(16338, gl_dispatch_stub_953, gl_dispatch_stub_953, NULL, 953),
-    NAME_FUNC_OFFSET(16358, gl_dispatch_stub_954, gl_dispatch_stub_954, NULL, 954),
-    NAME_FUNC_OFFSET(16377, gl_dispatch_stub_955, gl_dispatch_stub_955, NULL, 955),
-    NAME_FUNC_OFFSET(16397, gl_dispatch_stub_956, gl_dispatch_stub_956, NULL, 956),
-    NAME_FUNC_OFFSET(16417, gl_dispatch_stub_957, gl_dispatch_stub_957, NULL, 957),
-    NAME_FUNC_OFFSET(16438, gl_dispatch_stub_958, gl_dispatch_stub_958, NULL, 958),
-    NAME_FUNC_OFFSET(16457, gl_dispatch_stub_959, gl_dispatch_stub_959, NULL, 959),
-    NAME_FUNC_OFFSET(16477, gl_dispatch_stub_960, gl_dispatch_stub_960, NULL, 960),
-    NAME_FUNC_OFFSET(16496, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
-    NAME_FUNC_OFFSET(16516, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
-    NAME_FUNC_OFFSET(16535, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
-    NAME_FUNC_OFFSET(16555, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
-    NAME_FUNC_OFFSET(16575, gl_dispatch_stub_965, gl_dispatch_stub_965, NULL, 965),
-    NAME_FUNC_OFFSET(16596, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL, 966),
-    NAME_FUNC_OFFSET(16615, gl_dispatch_stub_967, gl_dispatch_stub_967, NULL, 967),
-    NAME_FUNC_OFFSET(16635, gl_dispatch_stub_968, gl_dispatch_stub_968, NULL, 968),
-    NAME_FUNC_OFFSET(16654, gl_dispatch_stub_969, gl_dispatch_stub_969, NULL, 969),
-    NAME_FUNC_OFFSET(16674, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL, 970),
-    NAME_FUNC_OFFSET(16693, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
-    NAME_FUNC_OFFSET(16713, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
-    NAME_FUNC_OFFSET(16733, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
-    NAME_FUNC_OFFSET(16754, gl_dispatch_stub_974, gl_dispatch_stub_974, NULL, 974),
-    NAME_FUNC_OFFSET(16773, gl_dispatch_stub_975, gl_dispatch_stub_975, NULL, 975),
-    NAME_FUNC_OFFSET(16793, gl_dispatch_stub_976, gl_dispatch_stub_976, NULL, 976),
-    NAME_FUNC_OFFSET(16812, gl_dispatch_stub_977, gl_dispatch_stub_977, NULL, 977),
-    NAME_FUNC_OFFSET(16832, gl_dispatch_stub_978, gl_dispatch_stub_978, NULL, 978),
-    NAME_FUNC_OFFSET(16851, gl_dispatch_stub_979, gl_dispatch_stub_979, NULL, 979),
-    NAME_FUNC_OFFSET(16871, gl_dispatch_stub_980, gl_dispatch_stub_980, NULL, 980),
-    NAME_FUNC_OFFSET(16891, gl_dispatch_stub_981, gl_dispatch_stub_981, NULL, 981),
-    NAME_FUNC_OFFSET(16912, gl_dispatch_stub_982, gl_dispatch_stub_982, NULL, 982),
-    NAME_FUNC_OFFSET(16938, gl_dispatch_stub_983, gl_dispatch_stub_983, NULL, 983),
-    NAME_FUNC_OFFSET(16964, gl_dispatch_stub_984, gl_dispatch_stub_984, NULL, 984),
-    NAME_FUNC_OFFSET(16992, gl_dispatch_stub_985, gl_dispatch_stub_985, NULL, 985),
-    NAME_FUNC_OFFSET(17020, gl_dispatch_stub_986, gl_dispatch_stub_986, NULL, 986),
-    NAME_FUNC_OFFSET(17048, gl_dispatch_stub_987, gl_dispatch_stub_987, NULL, 987),
-    NAME_FUNC_OFFSET(17076, gl_dispatch_stub_988, gl_dispatch_stub_988, NULL, 988),
-    NAME_FUNC_OFFSET(17102, gl_dispatch_stub_989, gl_dispatch_stub_989, NULL, 989),
-    NAME_FUNC_OFFSET(17128, gl_dispatch_stub_990, gl_dispatch_stub_990, NULL, 990),
-    NAME_FUNC_OFFSET(17156, gl_dispatch_stub_991, gl_dispatch_stub_991, NULL, 991),
-    NAME_FUNC_OFFSET(17184, gl_dispatch_stub_992, gl_dispatch_stub_992, NULL, 992),
-    NAME_FUNC_OFFSET(17212, gl_dispatch_stub_993, gl_dispatch_stub_993, NULL, 993),
-    NAME_FUNC_OFFSET(17240, gl_dispatch_stub_994, gl_dispatch_stub_994, NULL, 994),
-    NAME_FUNC_OFFSET(17266, gl_dispatch_stub_995, gl_dispatch_stub_995, NULL, 995),
-    NAME_FUNC_OFFSET(17292, gl_dispatch_stub_996, gl_dispatch_stub_996, NULL, 996),
-    NAME_FUNC_OFFSET(17320, gl_dispatch_stub_997, gl_dispatch_stub_997, NULL, 997),
-    NAME_FUNC_OFFSET(17348, gl_dispatch_stub_998, gl_dispatch_stub_998, NULL, 998),
-    NAME_FUNC_OFFSET(17376, gl_dispatch_stub_999, gl_dispatch_stub_999, NULL, 999),
-    NAME_FUNC_OFFSET(17404, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 1000),
-    NAME_FUNC_OFFSET(17422, gl_dispatch_stub_1001, gl_dispatch_stub_1001, NULL, 1001),
-    NAME_FUNC_OFFSET(17441, gl_dispatch_stub_1002, gl_dispatch_stub_1002, NULL, 1002),
-    NAME_FUNC_OFFSET(17467, glDebugMessageCallback, glDebugMessageCallback, NULL, 1003),
-    NAME_FUNC_OFFSET(17490, glDebugMessageControl, glDebugMessageControl, NULL, 1004),
-    NAME_FUNC_OFFSET(17512, glDebugMessageInsert, glDebugMessageInsert, NULL, 1005),
-    NAME_FUNC_OFFSET(17533, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 1006),
-    NAME_FUNC_OFFSET(17554, glGetObjectLabel, glGetObjectLabel, NULL, 1007),
-    NAME_FUNC_OFFSET(17571, glGetObjectPtrLabel, glGetObjectPtrLabel, NULL, 1008),
-    NAME_FUNC_OFFSET(17591, glObjectLabel, glObjectLabel, NULL, 1009),
-    NAME_FUNC_OFFSET(17605, glObjectPtrLabel, glObjectPtrLabel, NULL, 1010),
-    NAME_FUNC_OFFSET(17622, glPopDebugGroup, glPopDebugGroup, NULL, 1011),
-    NAME_FUNC_OFFSET(17638, glPushDebugGroup, glPushDebugGroup, NULL, 1012),
-    NAME_FUNC_OFFSET(17655, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 1013),
-    NAME_FUNC_OFFSET(17677, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 1014),
-    NAME_FUNC_OFFSET(17700, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 1015),
-    NAME_FUNC_OFFSET(17723, glFogCoordfEXT, glFogCoordfEXT, NULL, 1016),
-    NAME_FUNC_OFFSET(17738, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 1017),
-    NAME_FUNC_OFFSET(17754, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 1018),
-    NAME_FUNC_OFFSET(17774, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 1019),
-    NAME_FUNC_OFFSET(17792, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 1020),
-    NAME_FUNC_OFFSET(17811, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 1021),
-    NAME_FUNC_OFFSET(17829, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 1022),
-    NAME_FUNC_OFFSET(17848, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 1023),
-    NAME_FUNC_OFFSET(17866, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 1024),
-    NAME_FUNC_OFFSET(17885, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 1025),
-    NAME_FUNC_OFFSET(17903, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 1026),
-    NAME_FUNC_OFFSET(17922, gl_dispatch_stub_1027, gl_dispatch_stub_1027, NULL, 1027),
-    NAME_FUNC_OFFSET(17947, gl_dispatch_stub_1028, gl_dispatch_stub_1028, NULL, 1028),
-    NAME_FUNC_OFFSET(17974, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 1029),
-    NAME_FUNC_OFFSET(17998, glExecuteProgramNV, glExecuteProgramNV, NULL, 1030),
-    NAME_FUNC_OFFSET(18017, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 1031),
-    NAME_FUNC_OFFSET(18043, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 1032),
-    NAME_FUNC_OFFSET(18069, glGetProgramStringNV, glGetProgramStringNV, NULL, 1033),
-    NAME_FUNC_OFFSET(18090, glGetProgramivNV, glGetProgramivNV, NULL, 1034),
-    NAME_FUNC_OFFSET(18107, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 1035),
-    NAME_FUNC_OFFSET(18128, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 1036),
-    NAME_FUNC_OFFSET(18150, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 1037),
-    NAME_FUNC_OFFSET(18172, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 1038),
-    NAME_FUNC_OFFSET(18194, glLoadProgramNV, glLoadProgramNV, NULL, 1039),
-    NAME_FUNC_OFFSET(18210, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 1040),
-    NAME_FUNC_OFFSET(18235, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 1041),
-    NAME_FUNC_OFFSET(18260, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 1042),
-    NAME_FUNC_OFFSET(18288, glTrackMatrixNV, glTrackMatrixNV, NULL, 1043),
-    NAME_FUNC_OFFSET(18304, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 1044),
-    NAME_FUNC_OFFSET(18323, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 1045),
-    NAME_FUNC_OFFSET(18343, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 1046),
-    NAME_FUNC_OFFSET(18362, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 1047),
-    NAME_FUNC_OFFSET(18382, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 1048),
-    NAME_FUNC_OFFSET(18401, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 1049),
-    NAME_FUNC_OFFSET(18421, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 1050),
-    NAME_FUNC_OFFSET(18440, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 1051),
-    NAME_FUNC_OFFSET(18460, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 1052),
-    NAME_FUNC_OFFSET(18479, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 1053),
-    NAME_FUNC_OFFSET(18499, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 1054),
-    NAME_FUNC_OFFSET(18518, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 1055),
-    NAME_FUNC_OFFSET(18538, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 1056),
-    NAME_FUNC_OFFSET(18557, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 1057),
-    NAME_FUNC_OFFSET(18577, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 1058),
-    NAME_FUNC_OFFSET(18596, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 1059),
-    NAME_FUNC_OFFSET(18616, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 1060),
-    NAME_FUNC_OFFSET(18635, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 1061),
-    NAME_FUNC_OFFSET(18655, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 1062),
-    NAME_FUNC_OFFSET(18674, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 1063),
-    NAME_FUNC_OFFSET(18694, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 1064),
-    NAME_FUNC_OFFSET(18713, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 1065),
-    NAME_FUNC_OFFSET(18733, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 1066),
-    NAME_FUNC_OFFSET(18752, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 1067),
-    NAME_FUNC_OFFSET(18772, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 1068),
-    NAME_FUNC_OFFSET(18792, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 1069),
-    NAME_FUNC_OFFSET(18813, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 1070),
-    NAME_FUNC_OFFSET(18837, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 1071),
-    NAME_FUNC_OFFSET(18858, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 1072),
-    NAME_FUNC_OFFSET(18879, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 1073),
-    NAME_FUNC_OFFSET(18900, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 1074),
-    NAME_FUNC_OFFSET(18921, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 1075),
-    NAME_FUNC_OFFSET(18942, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 1076),
-    NAME_FUNC_OFFSET(18963, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 1077),
-    NAME_FUNC_OFFSET(18984, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 1078),
-    NAME_FUNC_OFFSET(19005, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 1079),
-    NAME_FUNC_OFFSET(19026, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 1080),
-    NAME_FUNC_OFFSET(19047, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 1081),
-    NAME_FUNC_OFFSET(19068, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 1082),
-    NAME_FUNC_OFFSET(19089, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 1083),
-    NAME_FUNC_OFFSET(19111, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 1084),
-    NAME_FUNC_OFFSET(19138, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 1085),
-    NAME_FUNC_OFFSET(19165, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 1086),
-    NAME_FUNC_OFFSET(19189, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 1087),
-    NAME_FUNC_OFFSET(19213, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 1088),
-    NAME_FUNC_OFFSET(19235, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 1089),
-    NAME_FUNC_OFFSET(19257, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 1090),
-    NAME_FUNC_OFFSET(19279, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 1091),
-    NAME_FUNC_OFFSET(19304, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 1092),
-    NAME_FUNC_OFFSET(19328, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 1093),
-    NAME_FUNC_OFFSET(19350, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 1094),
-    NAME_FUNC_OFFSET(19372, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 1095),
-    NAME_FUNC_OFFSET(19394, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 1096),
-    NAME_FUNC_OFFSET(19420, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 1097),
-    NAME_FUNC_OFFSET(19443, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 1098),
-    NAME_FUNC_OFFSET(19467, glPassTexCoordATI, glPassTexCoordATI, NULL, 1099),
-    NAME_FUNC_OFFSET(19485, glSampleMapATI, glSampleMapATI, NULL, 1100),
-    NAME_FUNC_OFFSET(19500, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 1101),
-    NAME_FUNC_OFFSET(19531, gl_dispatch_stub_1102, gl_dispatch_stub_1102, NULL, 1102),
-    NAME_FUNC_OFFSET(19554, gl_dispatch_stub_1103, gl_dispatch_stub_1103, NULL, 1103),
-    NAME_FUNC_OFFSET(19577, gl_dispatch_stub_1104, gl_dispatch_stub_1104, NULL, 1104),
-    NAME_FUNC_OFFSET(19600, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 1105),
-    NAME_FUNC_OFFSET(19631, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 1106),
-    NAME_FUNC_OFFSET(19662, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 1107),
-    NAME_FUNC_OFFSET(19690, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 1108),
-    NAME_FUNC_OFFSET(19719, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 1109),
-    NAME_FUNC_OFFSET(19747, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 1110),
-    NAME_FUNC_OFFSET(19776, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 1111),
-    NAME_FUNC_OFFSET(19797, gl_dispatch_stub_1112, gl_dispatch_stub_1112, NULL, 1112),
-    NAME_FUNC_OFFSET(19814, gl_dispatch_stub_1113, gl_dispatch_stub_1113, NULL, 1113),
-    NAME_FUNC_OFFSET(19827, gl_dispatch_stub_1114, gl_dispatch_stub_1114, NULL, 1114),
-    NAME_FUNC_OFFSET(19841, gl_dispatch_stub_1115, gl_dispatch_stub_1115, NULL, 1115),
-    NAME_FUNC_OFFSET(19858, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 1116),
-    NAME_FUNC_OFFSET(19879, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 1117),
-    NAME_FUNC_OFFSET(19901, gl_dispatch_stub_1118, gl_dispatch_stub_1118, NULL, 1118),
-    NAME_FUNC_OFFSET(19925, gl_dispatch_stub_1119, gl_dispatch_stub_1119, NULL, 1119),
-    NAME_FUNC_OFFSET(19955, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1120),
-    NAME_FUNC_OFFSET(19976, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1121),
-    NAME_FUNC_OFFSET(19998, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1122),
-    NAME_FUNC_OFFSET(20019, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1123),
-    NAME_FUNC_OFFSET(20041, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1124),
-    NAME_FUNC_OFFSET(20063, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1125),
-    NAME_FUNC_OFFSET(20086, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1126),
-    NAME_FUNC_OFFSET(20107, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1127),
-    NAME_FUNC_OFFSET(20129, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1128),
-    NAME_FUNC_OFFSET(20151, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1129),
-    NAME_FUNC_OFFSET(20174, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1130),
-    NAME_FUNC_OFFSET(20195, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1131),
-    NAME_FUNC_OFFSET(20217, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1132),
-    NAME_FUNC_OFFSET(20239, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1133),
-    NAME_FUNC_OFFSET(20262, glClearColorIiEXT, glClearColorIiEXT, NULL, 1134),
-    NAME_FUNC_OFFSET(20280, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 1135),
-    NAME_FUNC_OFFSET(20299, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 1136),
-    NAME_FUNC_OFFSET(20321, glBeginPerfMonitorAMD, glBeginPerfMonitorAMD, NULL, 1137),
-    NAME_FUNC_OFFSET(20343, glDeletePerfMonitorsAMD, glDeletePerfMonitorsAMD, NULL, 1138),
-    NAME_FUNC_OFFSET(20367, glEndPerfMonitorAMD, glEndPerfMonitorAMD, NULL, 1139),
-    NAME_FUNC_OFFSET(20387, glGenPerfMonitorsAMD, glGenPerfMonitorsAMD, NULL, 1140),
-    NAME_FUNC_OFFSET(20408, glGetPerfMonitorCounterDataAMD, glGetPerfMonitorCounterDataAMD, NULL, 1141),
-    NAME_FUNC_OFFSET(20439, glGetPerfMonitorCounterInfoAMD, glGetPerfMonitorCounterInfoAMD, NULL, 1142),
-    NAME_FUNC_OFFSET(20470, glGetPerfMonitorCounterStringAMD, glGetPerfMonitorCounterStringAMD, NULL, 1143),
-    NAME_FUNC_OFFSET(20503, glGetPerfMonitorCountersAMD, glGetPerfMonitorCountersAMD, NULL, 1144),
-    NAME_FUNC_OFFSET(20531, glGetPerfMonitorGroupStringAMD, glGetPerfMonitorGroupStringAMD, NULL, 1145),
-    NAME_FUNC_OFFSET(20562, glGetPerfMonitorGroupsAMD, glGetPerfMonitorGroupsAMD, NULL, 1146),
-    NAME_FUNC_OFFSET(20588, glSelectPerfMonitorCountersAMD, glSelectPerfMonitorCountersAMD, NULL, 1147),
-    NAME_FUNC_OFFSET(20619, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 1148),
-    NAME_FUNC_OFFSET(20647, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 1149),
-    NAME_FUNC_OFFSET(20670, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 1150),
-    NAME_FUNC_OFFSET(20695, glActiveProgramEXT, glActiveProgramEXT, NULL, 1151),
-    NAME_FUNC_OFFSET(20714, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 1152),
-    NAME_FUNC_OFFSET(20739, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 1153),
-    NAME_FUNC_OFFSET(20761, glTextureBarrierNV, glTextureBarrierNV, NULL, 1154),
-    NAME_FUNC_OFFSET(20780, glVDPAUFiniNV, glVDPAUFiniNV, NULL, 1155),
-    NAME_FUNC_OFFSET(20794, glVDPAUGetSurfaceivNV, glVDPAUGetSurfaceivNV, NULL, 1156),
-    NAME_FUNC_OFFSET(20816, glVDPAUInitNV, glVDPAUInitNV, NULL, 1157),
-    NAME_FUNC_OFFSET(20830, glVDPAUIsSurfaceNV, glVDPAUIsSurfaceNV, NULL, 1158),
-    NAME_FUNC_OFFSET(20849, glVDPAUMapSurfacesNV, glVDPAUMapSurfacesNV, NULL, 1159),
-    NAME_FUNC_OFFSET(20870, glVDPAURegisterOutputSurfaceNV, glVDPAURegisterOutputSurfaceNV, NULL, 1160),
-    NAME_FUNC_OFFSET(20901, glVDPAURegisterVideoSurfaceNV, glVDPAURegisterVideoSurfaceNV, NULL, 1161),
-    NAME_FUNC_OFFSET(20931, glVDPAUSurfaceAccessNV, glVDPAUSurfaceAccessNV, NULL, 1162),
-    NAME_FUNC_OFFSET(20954, glVDPAUUnmapSurfacesNV, glVDPAUUnmapSurfacesNV, NULL, 1163),
-    NAME_FUNC_OFFSET(20977, glVDPAUUnregisterSurfaceNV, glVDPAUUnregisterSurfaceNV, NULL, 1164),
-    NAME_FUNC_OFFSET(21004, gl_dispatch_stub_1165, gl_dispatch_stub_1165, NULL, 1165),
-    NAME_FUNC_OFFSET(21026, gl_dispatch_stub_1166, gl_dispatch_stub_1166, NULL, 1166),
-    NAME_FUNC_OFFSET(21049, gl_dispatch_stub_1167, gl_dispatch_stub_1167, NULL, 1167),
-    NAME_FUNC_OFFSET(21072, gl_dispatch_stub_1168, gl_dispatch_stub_1168, NULL, 1168),
-    NAME_FUNC_OFFSET(21092, gl_dispatch_stub_1169, gl_dispatch_stub_1169, NULL, 1169),
-    NAME_FUNC_OFFSET(21119, gl_dispatch_stub_1170, gl_dispatch_stub_1170, NULL, 1170),
-    NAME_FUNC_OFFSET(21145, gl_dispatch_stub_1171, gl_dispatch_stub_1171, NULL, 1171),
-    NAME_FUNC_OFFSET(21171, gl_dispatch_stub_1172, gl_dispatch_stub_1172, NULL, 1172),
-    NAME_FUNC_OFFSET(21195, gl_dispatch_stub_1173, gl_dispatch_stub_1173, NULL, 1173),
-    NAME_FUNC_OFFSET(21223, gl_dispatch_stub_1174, gl_dispatch_stub_1174, NULL, 1174),
-    NAME_FUNC_OFFSET(21247, glPolygonOffsetClampEXT, glPolygonOffsetClampEXT, NULL, 1175),
-    NAME_FUNC_OFFSET(21271, gl_dispatch_stub_1176, gl_dispatch_stub_1176, NULL, 1176),
-    NAME_FUNC_OFFSET(21296, gl_dispatch_stub_1177, gl_dispatch_stub_1177, NULL, 1177),
-    NAME_FUNC_OFFSET(21325, gl_dispatch_stub_1178, gl_dispatch_stub_1178, NULL, 1178),
-    NAME_FUNC_OFFSET(21356, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 1179),
-    NAME_FUNC_OFFSET(21395, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 1180),
-    NAME_FUNC_OFFSET(21424, glAlphaFuncx, glAlphaFuncx, NULL, 1181),
-    NAME_FUNC_OFFSET(21437, glClearColorx, glClearColorx, NULL, 1182),
-    NAME_FUNC_OFFSET(21451, glClearDepthx, glClearDepthx, NULL, 1183),
-    NAME_FUNC_OFFSET(21465, glColor4x, glColor4x, NULL, 1184),
-    NAME_FUNC_OFFSET(21475, glDepthRangex, glDepthRangex, NULL, 1185),
-    NAME_FUNC_OFFSET(21489, glFogx, glFogx, NULL, 1186),
-    NAME_FUNC_OFFSET(21496, glFogxv, glFogxv, NULL, 1187),
-    NAME_FUNC_OFFSET(21504, glFrustumf, glFrustumf, NULL, 1188),
-    NAME_FUNC_OFFSET(21515, glFrustumx, glFrustumx, NULL, 1189),
-    NAME_FUNC_OFFSET(21526, glLightModelx, glLightModelx, NULL, 1190),
-    NAME_FUNC_OFFSET(21540, glLightModelxv, glLightModelxv, NULL, 1191),
-    NAME_FUNC_OFFSET(21555, glLightx, glLightx, NULL, 1192),
-    NAME_FUNC_OFFSET(21564, glLightxv, glLightxv, NULL, 1193),
-    NAME_FUNC_OFFSET(21574, glLineWidthx, glLineWidthx, NULL, 1194),
-    NAME_FUNC_OFFSET(21587, glLoadMatrixx, glLoadMatrixx, NULL, 1195),
-    NAME_FUNC_OFFSET(21601, glMaterialx, glMaterialx, NULL, 1196),
-    NAME_FUNC_OFFSET(21613, glMaterialxv, glMaterialxv, NULL, 1197),
-    NAME_FUNC_OFFSET(21626, glMultMatrixx, glMultMatrixx, NULL, 1198),
-    NAME_FUNC_OFFSET(21640, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1199),
-    NAME_FUNC_OFFSET(21658, glNormal3x, glNormal3x, NULL, 1200),
-    NAME_FUNC_OFFSET(21669, glOrthof, glOrthof, NULL, 1201),
-    NAME_FUNC_OFFSET(21678, glOrthox, glOrthox, NULL, 1202),
-    NAME_FUNC_OFFSET(21687, glPointSizex, glPointSizex, NULL, 1203),
-    NAME_FUNC_OFFSET(21700, glPolygonOffsetx, glPolygonOffsetx, NULL, 1204),
-    NAME_FUNC_OFFSET(21717, glRotatex, glRotatex, NULL, 1205),
-    NAME_FUNC_OFFSET(21727, glSampleCoveragex, glSampleCoveragex, NULL, 1206),
-    NAME_FUNC_OFFSET(21745, glScalex, glScalex, NULL, 1207),
-    NAME_FUNC_OFFSET(21754, glTexEnvx, glTexEnvx, NULL, 1208),
-    NAME_FUNC_OFFSET(21764, glTexEnvxv, glTexEnvxv, NULL, 1209),
-    NAME_FUNC_OFFSET(21775, glTexParameterx, glTexParameterx, NULL, 1210),
-    NAME_FUNC_OFFSET(21791, glTranslatex, glTranslatex, NULL, 1211),
-    NAME_FUNC_OFFSET(21804, glClipPlanef, glClipPlanef, NULL, 1212),
-    NAME_FUNC_OFFSET(21817, glClipPlanex, glClipPlanex, NULL, 1213),
-    NAME_FUNC_OFFSET(21830, glGetClipPlanef, glGetClipPlanef, NULL, 1214),
-    NAME_FUNC_OFFSET(21846, glGetClipPlanex, glGetClipPlanex, NULL, 1215),
-    NAME_FUNC_OFFSET(21862, glGetFixedv, glGetFixedv, NULL, 1216),
-    NAME_FUNC_OFFSET(21874, glGetLightxv, glGetLightxv, NULL, 1217),
-    NAME_FUNC_OFFSET(21887, glGetMaterialxv, glGetMaterialxv, NULL, 1218),
-    NAME_FUNC_OFFSET(21903, glGetTexEnvxv, glGetTexEnvxv, NULL, 1219),
-    NAME_FUNC_OFFSET(21917, glGetTexParameterxv, glGetTexParameterxv, NULL, 1220),
-    NAME_FUNC_OFFSET(21937, glPointParameterx, glPointParameterx, NULL, 1221),
-    NAME_FUNC_OFFSET(21955, glPointParameterxv, glPointParameterxv, NULL, 1222),
-    NAME_FUNC_OFFSET(21974, glTexParameterxv, glTexParameterxv, NULL, 1223),
-    NAME_FUNC_OFFSET(21991, glTexGenf, glTexGenf, NULL, 190),
-    NAME_FUNC_OFFSET(22004, glTexGenfv, glTexGenfv, NULL, 191),
-    NAME_FUNC_OFFSET(22018, glTexGeni, glTexGeni, NULL, 192),
-    NAME_FUNC_OFFSET(22031, glTexGeniv, glTexGeniv, NULL, 193),
-    NAME_FUNC_OFFSET(22045, glReadBuffer, glReadBuffer, NULL, 254),
-    NAME_FUNC_OFFSET(22060, glGetTexGenfv, glGetTexGenfv, NULL, 279),
-    NAME_FUNC_OFFSET(22077, glGetTexGeniv, glGetTexGeniv, NULL, 280),
-    NAME_FUNC_OFFSET(22094, glArrayElement, glArrayElement, NULL, 306),
-    NAME_FUNC_OFFSET(22112, glBindTexture, glBindTexture, NULL, 307),
-    NAME_FUNC_OFFSET(22129, glDrawArrays, glDrawArrays, NULL, 310),
-    NAME_FUNC_OFFSET(22145, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
-    NAME_FUNC_OFFSET(22170, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
-    NAME_FUNC_OFFSET(22190, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
-    NAME_FUNC_OFFSET(22210, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
-    NAME_FUNC_OFFSET(22233, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
-    NAME_FUNC_OFFSET(22256, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
-    NAME_FUNC_OFFSET(22276, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
-    NAME_FUNC_OFFSET(22293, glGetPointerv, glGetPointerv, NULL, 329),
-    NAME_FUNC_OFFSET(22310, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
-    NAME_FUNC_OFFSET(22325, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
-    NAME_FUNC_OFFSET(22349, glTexSubImage1D, glTexSubImage1D, NULL, 332),
-    NAME_FUNC_OFFSET(22368, glTexSubImage2D, glTexSubImage2D, NULL, 333),
-    NAME_FUNC_OFFSET(22387, glBlendColor, glBlendColor, NULL, 336),
-    NAME_FUNC_OFFSET(22403, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(22422, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(22441, glDrawRangeElements, glDrawRangeElements, NULL, 338),
-    NAME_FUNC_OFFSET(22464, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(22480, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(22496, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
-    NAME_FUNC_OFFSET(22523, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
-    NAME_FUNC_OFFSET(22550, glCopyColorTable, glCopyColorTable, NULL, 342),
-    NAME_FUNC_OFFSET(22570, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(22589, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(22608, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(22638, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(22668, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(22698, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(22728, glColorSubTable, glColorSubTable, NULL, 346),
-    NAME_FUNC_OFFSET(22747, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
-    NAME_FUNC_OFFSET(22770, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
-    NAME_FUNC_OFFSET(22795, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
-    NAME_FUNC_OFFSET(22820, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
-    NAME_FUNC_OFFSET(22847, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
-    NAME_FUNC_OFFSET(22875, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
-    NAME_FUNC_OFFSET(22902, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
-    NAME_FUNC_OFFSET(22930, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
-    NAME_FUNC_OFFSET(22959, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
-    NAME_FUNC_OFFSET(22988, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
-    NAME_FUNC_OFFSET(23014, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
-    NAME_FUNC_OFFSET(23045, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
-    NAME_FUNC_OFFSET(23076, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
-    NAME_FUNC_OFFSET(23100, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
-    NAME_FUNC_OFFSET(23123, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
-    NAME_FUNC_OFFSET(23141, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
-    NAME_FUNC_OFFSET(23170, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
-    NAME_FUNC_OFFSET(23199, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
-    NAME_FUNC_OFFSET(23214, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
-    NAME_FUNC_OFFSET(23240, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
-    NAME_FUNC_OFFSET(23266, glHistogram, glHistogram, NULL, 367),
-    NAME_FUNC_OFFSET(23281, glMinmax, glMinmax, NULL, 368),
-    NAME_FUNC_OFFSET(23293, glResetHistogram, glResetHistogram, NULL, 369),
-    NAME_FUNC_OFFSET(23313, glResetMinmax, glResetMinmax, NULL, 370),
-    NAME_FUNC_OFFSET(23330, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(23346, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(23362, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(23381, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(23400, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(23423, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(23446, glActiveTexture, glActiveTexture, NULL, 374),
-    NAME_FUNC_OFFSET(23465, glClientActiveTexture, glClientActiveTexture, NULL, 375),
-    NAME_FUNC_OFFSET(23490, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376),
-    NAME_FUNC_OFFSET(23511, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377),
-    NAME_FUNC_OFFSET(23533, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
-    NAME_FUNC_OFFSET(23551, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
-    NAME_FUNC_OFFSET(23570, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380),
-    NAME_FUNC_OFFSET(23591, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381),
-    NAME_FUNC_OFFSET(23613, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382),
-    NAME_FUNC_OFFSET(23634, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383),
-    NAME_FUNC_OFFSET(23656, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384),
-    NAME_FUNC_OFFSET(23677, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385),
-    NAME_FUNC_OFFSET(23699, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
-    NAME_FUNC_OFFSET(23717, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
-    NAME_FUNC_OFFSET(23736, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388),
-    NAME_FUNC_OFFSET(23757, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389),
-    NAME_FUNC_OFFSET(23779, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390),
-    NAME_FUNC_OFFSET(23800, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391),
-    NAME_FUNC_OFFSET(23822, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392),
-    NAME_FUNC_OFFSET(23843, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393),
-    NAME_FUNC_OFFSET(23865, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
-    NAME_FUNC_OFFSET(23883, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
-    NAME_FUNC_OFFSET(23902, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396),
-    NAME_FUNC_OFFSET(23923, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397),
-    NAME_FUNC_OFFSET(23945, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398),
-    NAME_FUNC_OFFSET(23966, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399),
-    NAME_FUNC_OFFSET(23988, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400),
-    NAME_FUNC_OFFSET(24009, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401),
-    NAME_FUNC_OFFSET(24031, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
-    NAME_FUNC_OFFSET(24049, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
-    NAME_FUNC_OFFSET(24068, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404),
-    NAME_FUNC_OFFSET(24089, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405),
-    NAME_FUNC_OFFSET(24111, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406),
-    NAME_FUNC_OFFSET(24132, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407),
-    NAME_FUNC_OFFSET(24154, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408),
-    NAME_FUNC_OFFSET(24180, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409),
-    NAME_FUNC_OFFSET(24206, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
-    NAME_FUNC_OFFSET(24232, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
-    NAME_FUNC_OFFSET(24258, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411),
-    NAME_FUNC_OFFSET(24287, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412),
-    NAME_FUNC_OFFSET(24316, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
-    NAME_FUNC_OFFSET(24345, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
-    NAME_FUNC_OFFSET(24374, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414),
-    NAME_FUNC_OFFSET(24401, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415),
-    NAME_FUNC_OFFSET(24427, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416),
-    NAME_FUNC_OFFSET(24453, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417),
-    NAME_FUNC_OFFSET(24479, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418),
-    NAME_FUNC_OFFSET(24505, glSampleCoverage, glSampleCoverage, NULL, 419),
-    NAME_FUNC_OFFSET(24525, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
-    NAME_FUNC_OFFSET(24548, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
-    NAME_FUNC_OFFSET(24572, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
-    NAME_FUNC_OFFSET(24595, glFogCoordPointer, glFogCoordPointer, NULL, 421),
-    NAME_FUNC_OFFSET(24616, glFogCoordd, glFogCoordd, NULL, 422),
-    NAME_FUNC_OFFSET(24631, glFogCoorddv, glFogCoorddv, NULL, 423),
-    NAME_FUNC_OFFSET(24647, glMultiDrawArrays, glMultiDrawArrays, NULL, 424),
-    NAME_FUNC_OFFSET(24668, glPointParameterf, glPointParameterf, NULL, 425),
-    NAME_FUNC_OFFSET(24689, glPointParameterf, glPointParameterf, NULL, 425),
-    NAME_FUNC_OFFSET(24710, glPointParameterf, glPointParameterf, NULL, 425),
-    NAME_FUNC_OFFSET(24732, glPointParameterfv, glPointParameterfv, NULL, 426),
-    NAME_FUNC_OFFSET(24754, glPointParameterfv, glPointParameterfv, NULL, 426),
-    NAME_FUNC_OFFSET(24776, glPointParameterfv, glPointParameterfv, NULL, 426),
-    NAME_FUNC_OFFSET(24799, glPointParameteri, glPointParameteri, NULL, 427),
-    NAME_FUNC_OFFSET(24819, glPointParameteriv, glPointParameteriv, NULL, 428),
-    NAME_FUNC_OFFSET(24840, glSecondaryColor3b, glSecondaryColor3b, NULL, 429),
-    NAME_FUNC_OFFSET(24862, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430),
-    NAME_FUNC_OFFSET(24885, glSecondaryColor3d, glSecondaryColor3d, NULL, 431),
-    NAME_FUNC_OFFSET(24907, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432),
-    NAME_FUNC_OFFSET(24930, glSecondaryColor3i, glSecondaryColor3i, NULL, 433),
-    NAME_FUNC_OFFSET(24952, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434),
-    NAME_FUNC_OFFSET(24975, glSecondaryColor3s, glSecondaryColor3s, NULL, 435),
-    NAME_FUNC_OFFSET(24997, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436),
-    NAME_FUNC_OFFSET(25020, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437),
-    NAME_FUNC_OFFSET(25043, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438),
-    NAME_FUNC_OFFSET(25067, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439),
-    NAME_FUNC_OFFSET(25090, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440),
-    NAME_FUNC_OFFSET(25114, glSecondaryColor3us, glSecondaryColor3us, NULL, 441),
-    NAME_FUNC_OFFSET(25137, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442),
-    NAME_FUNC_OFFSET(25161, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443),
-    NAME_FUNC_OFFSET(25188, glWindowPos2d, glWindowPos2d, NULL, 444),
-    NAME_FUNC_OFFSET(25205, glWindowPos2d, glWindowPos2d, NULL, 444),
-    NAME_FUNC_OFFSET(25223, glWindowPos2dv, glWindowPos2dv, NULL, 445),
-    NAME_FUNC_OFFSET(25241, glWindowPos2dv, glWindowPos2dv, NULL, 445),
-    NAME_FUNC_OFFSET(25260, glWindowPos2f, glWindowPos2f, NULL, 446),
-    NAME_FUNC_OFFSET(25277, glWindowPos2f, glWindowPos2f, NULL, 446),
-    NAME_FUNC_OFFSET(25295, glWindowPos2fv, glWindowPos2fv, NULL, 447),
-    NAME_FUNC_OFFSET(25313, glWindowPos2fv, glWindowPos2fv, NULL, 447),
-    NAME_FUNC_OFFSET(25332, glWindowPos2i, glWindowPos2i, NULL, 448),
-    NAME_FUNC_OFFSET(25349, glWindowPos2i, glWindowPos2i, NULL, 448),
-    NAME_FUNC_OFFSET(25367, glWindowPos2iv, glWindowPos2iv, NULL, 449),
-    NAME_FUNC_OFFSET(25385, glWindowPos2iv, glWindowPos2iv, NULL, 449),
-    NAME_FUNC_OFFSET(25404, glWindowPos2s, glWindowPos2s, NULL, 450),
-    NAME_FUNC_OFFSET(25421, glWindowPos2s, glWindowPos2s, NULL, 450),
-    NAME_FUNC_OFFSET(25439, glWindowPos2sv, glWindowPos2sv, NULL, 451),
-    NAME_FUNC_OFFSET(25457, glWindowPos2sv, glWindowPos2sv, NULL, 451),
-    NAME_FUNC_OFFSET(25476, glWindowPos3d, glWindowPos3d, NULL, 452),
-    NAME_FUNC_OFFSET(25493, glWindowPos3d, glWindowPos3d, NULL, 452),
-    NAME_FUNC_OFFSET(25511, glWindowPos3dv, glWindowPos3dv, NULL, 453),
-    NAME_FUNC_OFFSET(25529, glWindowPos3dv, glWindowPos3dv, NULL, 453),
-    NAME_FUNC_OFFSET(25548, glWindowPos3f, glWindowPos3f, NULL, 454),
-    NAME_FUNC_OFFSET(25565, glWindowPos3f, glWindowPos3f, NULL, 454),
-    NAME_FUNC_OFFSET(25583, glWindowPos3fv, glWindowPos3fv, NULL, 455),
-    NAME_FUNC_OFFSET(25601, glWindowPos3fv, glWindowPos3fv, NULL, 455),
-    NAME_FUNC_OFFSET(25620, glWindowPos3i, glWindowPos3i, NULL, 456),
-    NAME_FUNC_OFFSET(25637, glWindowPos3i, glWindowPos3i, NULL, 456),
-    NAME_FUNC_OFFSET(25655, glWindowPos3iv, glWindowPos3iv, NULL, 457),
-    NAME_FUNC_OFFSET(25673, glWindowPos3iv, glWindowPos3iv, NULL, 457),
-    NAME_FUNC_OFFSET(25692, glWindowPos3s, glWindowPos3s, NULL, 458),
-    NAME_FUNC_OFFSET(25709, glWindowPos3s, glWindowPos3s, NULL, 458),
-    NAME_FUNC_OFFSET(25727, glWindowPos3sv, glWindowPos3sv, NULL, 459),
-    NAME_FUNC_OFFSET(25745, glWindowPos3sv, glWindowPos3sv, NULL, 459),
-    NAME_FUNC_OFFSET(25764, glBeginQuery, glBeginQuery, NULL, 460),
-    NAME_FUNC_OFFSET(25780, glBindBuffer, glBindBuffer, NULL, 461),
-    NAME_FUNC_OFFSET(25796, glBufferData, glBufferData, NULL, 462),
-    NAME_FUNC_OFFSET(25812, glBufferSubData, glBufferSubData, NULL, 463),
-    NAME_FUNC_OFFSET(25831, glDeleteBuffers, glDeleteBuffers, NULL, 464),
-    NAME_FUNC_OFFSET(25850, glDeleteQueries, glDeleteQueries, NULL, 465),
-    NAME_FUNC_OFFSET(25869, glEndQuery, glEndQuery, NULL, 466),
-    NAME_FUNC_OFFSET(25883, glGenBuffers, glGenBuffers, NULL, 467),
-    NAME_FUNC_OFFSET(25899, glGenQueries, glGenQueries, NULL, 468),
-    NAME_FUNC_OFFSET(25915, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469),
-    NAME_FUNC_OFFSET(25941, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
-    NAME_FUNC_OFFSET(25964, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
-    NAME_FUNC_OFFSET(25987, glGetBufferSubData, glGetBufferSubData, NULL, 471),
-    NAME_FUNC_OFFSET(26009, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472),
-    NAME_FUNC_OFFSET(26031, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473),
-    NAME_FUNC_OFFSET(26054, glGetQueryiv, glGetQueryiv, NULL, 474),
-    NAME_FUNC_OFFSET(26070, glIsBuffer, glIsBuffer, NULL, 475),
-    NAME_FUNC_OFFSET(26084, glIsQuery, glIsQuery, NULL, 476),
-    NAME_FUNC_OFFSET(26097, glMapBuffer, glMapBuffer, NULL, 477),
-    NAME_FUNC_OFFSET(26112, glMapBuffer, glMapBuffer, NULL, 477),
-    NAME_FUNC_OFFSET(26127, glUnmapBuffer, glUnmapBuffer, NULL, 478),
-    NAME_FUNC_OFFSET(26144, glUnmapBuffer, glUnmapBuffer, NULL, 478),
-    NAME_FUNC_OFFSET(26161, glBindAttribLocation, glBindAttribLocation, NULL, 480),
-    NAME_FUNC_OFFSET(26185, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
-    NAME_FUNC_OFFSET(26212, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
-    NAME_FUNC_OFFSET(26239, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
-    NAME_FUNC_OFFSET(26266, glCompileShader, glCompileShader, NULL, 482),
-    NAME_FUNC_OFFSET(26285, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488),
-    NAME_FUNC_OFFSET(26315, glDrawBuffers, glDrawBuffers, NULL, 489),
-    NAME_FUNC_OFFSET(26332, glDrawBuffers, glDrawBuffers, NULL, 489),
-    NAME_FUNC_OFFSET(26349, glDrawBuffers, glDrawBuffers, NULL, 489),
-    NAME_FUNC_OFFSET(26365, glDrawBuffers, glDrawBuffers, NULL, 489),
-    NAME_FUNC_OFFSET(26382, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490),
-    NAME_FUNC_OFFSET(26411, glGetActiveAttrib, glGetActiveAttrib, NULL, 491),
-    NAME_FUNC_OFFSET(26432, glGetActiveUniform, glGetActiveUniform, NULL, 492),
-    NAME_FUNC_OFFSET(26454, glGetAttribLocation, glGetAttribLocation, NULL, 494),
-    NAME_FUNC_OFFSET(26477, glGetShaderSource, glGetShaderSource, NULL, 498),
-    NAME_FUNC_OFFSET(26498, glGetUniformLocation, glGetUniformLocation, NULL, 500),
-    NAME_FUNC_OFFSET(26522, glGetUniformfv, glGetUniformfv, NULL, 501),
-    NAME_FUNC_OFFSET(26540, glGetUniformiv, glGetUniformiv, NULL, 502),
-    NAME_FUNC_OFFSET(26558, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
-    NAME_FUNC_OFFSET(26587, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
-    NAME_FUNC_OFFSET(26615, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504),
-    NAME_FUNC_OFFSET(26638, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505),
-    NAME_FUNC_OFFSET(26661, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506),
-    NAME_FUNC_OFFSET(26684, glLinkProgram, glLinkProgram, NULL, 509),
-    NAME_FUNC_OFFSET(26701, glShaderSource, glShaderSource, NULL, 510),
-    NAME_FUNC_OFFSET(26719, glStencilOpSeparate, glStencilOpSeparate, NULL, 513),
-    NAME_FUNC_OFFSET(26742, glUniform1f, glUniform1f, NULL, 514),
-    NAME_FUNC_OFFSET(26757, glUniform1fv, glUniform1fv, NULL, 515),
-    NAME_FUNC_OFFSET(26773, glUniform1i, glUniform1i, NULL, 516),
-    NAME_FUNC_OFFSET(26788, glUniform1iv, glUniform1iv, NULL, 517),
-    NAME_FUNC_OFFSET(26804, glUniform2f, glUniform2f, NULL, 518),
-    NAME_FUNC_OFFSET(26819, glUniform2fv, glUniform2fv, NULL, 519),
-    NAME_FUNC_OFFSET(26835, glUniform2i, glUniform2i, NULL, 520),
-    NAME_FUNC_OFFSET(26850, glUniform2iv, glUniform2iv, NULL, 521),
-    NAME_FUNC_OFFSET(26866, glUniform3f, glUniform3f, NULL, 522),
-    NAME_FUNC_OFFSET(26881, glUniform3fv, glUniform3fv, NULL, 523),
-    NAME_FUNC_OFFSET(26897, glUniform3i, glUniform3i, NULL, 524),
-    NAME_FUNC_OFFSET(26912, glUniform3iv, glUniform3iv, NULL, 525),
-    NAME_FUNC_OFFSET(26928, glUniform4f, glUniform4f, NULL, 526),
-    NAME_FUNC_OFFSET(26943, glUniform4fv, glUniform4fv, NULL, 527),
-    NAME_FUNC_OFFSET(26959, glUniform4i, glUniform4i, NULL, 528),
-    NAME_FUNC_OFFSET(26974, glUniform4iv, glUniform4iv, NULL, 529),
-    NAME_FUNC_OFFSET(26990, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530),
-    NAME_FUNC_OFFSET(27012, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531),
-    NAME_FUNC_OFFSET(27034, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532),
-    NAME_FUNC_OFFSET(27056, glUseProgram, glUseProgram, NULL, 533),
-    NAME_FUNC_OFFSET(27078, glValidateProgram, glValidateProgram, NULL, 534),
-    NAME_FUNC_OFFSET(27099, glVertexAttrib1d, glVertexAttrib1d, NULL, 535),
-    NAME_FUNC_OFFSET(27119, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536),
-    NAME_FUNC_OFFSET(27140, glVertexAttrib1s, glVertexAttrib1s, NULL, 537),
-    NAME_FUNC_OFFSET(27160, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538),
-    NAME_FUNC_OFFSET(27181, glVertexAttrib2d, glVertexAttrib2d, NULL, 539),
-    NAME_FUNC_OFFSET(27201, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540),
-    NAME_FUNC_OFFSET(27222, glVertexAttrib2s, glVertexAttrib2s, NULL, 541),
-    NAME_FUNC_OFFSET(27242, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542),
-    NAME_FUNC_OFFSET(27263, glVertexAttrib3d, glVertexAttrib3d, NULL, 543),
-    NAME_FUNC_OFFSET(27283, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544),
-    NAME_FUNC_OFFSET(27304, glVertexAttrib3s, glVertexAttrib3s, NULL, 545),
-    NAME_FUNC_OFFSET(27324, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546),
-    NAME_FUNC_OFFSET(27345, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547),
-    NAME_FUNC_OFFSET(27367, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548),
-    NAME_FUNC_OFFSET(27389, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549),
-    NAME_FUNC_OFFSET(27411, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550),
-    NAME_FUNC_OFFSET(27433, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551),
-    NAME_FUNC_OFFSET(27456, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552),
-    NAME_FUNC_OFFSET(27479, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553),
-    NAME_FUNC_OFFSET(27502, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554),
-    NAME_FUNC_OFFSET(27523, glVertexAttrib4d, glVertexAttrib4d, NULL, 555),
-    NAME_FUNC_OFFSET(27543, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556),
-    NAME_FUNC_OFFSET(27564, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557),
-    NAME_FUNC_OFFSET(27585, glVertexAttrib4s, glVertexAttrib4s, NULL, 558),
-    NAME_FUNC_OFFSET(27605, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559),
-    NAME_FUNC_OFFSET(27626, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560),
-    NAME_FUNC_OFFSET(27648, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561),
-    NAME_FUNC_OFFSET(27670, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562),
-    NAME_FUNC_OFFSET(27692, glVertexAttribPointer, glVertexAttribPointer, NULL, 563),
-    NAME_FUNC_OFFSET(27717, glBeginConditionalRender, glBeginConditionalRender, NULL, 570),
-    NAME_FUNC_OFFSET(27744, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571),
-    NAME_FUNC_OFFSET(27772, glBindBufferBase, glBindBufferBase, NULL, 572),
-    NAME_FUNC_OFFSET(27792, glBindBufferRange, glBindBufferRange, NULL, 573),
-    NAME_FUNC_OFFSET(27813, glBindFragDataLocation, glBindFragDataLocation, NULL, 574),
-    NAME_FUNC_OFFSET(27839, glClampColor, glClampColor, NULL, 575),
-    NAME_FUNC_OFFSET(27855, glColorMaski, glColorMaski, NULL, 580),
-    NAME_FUNC_OFFSET(27877, glDisablei, glDisablei, NULL, 581),
-    NAME_FUNC_OFFSET(27897, glEnablei, glEnablei, NULL, 582),
-    NAME_FUNC_OFFSET(27916, glEndConditionalRender, glEndConditionalRender, NULL, 583),
-    NAME_FUNC_OFFSET(27941, glEndTransformFeedback, glEndTransformFeedback, NULL, 584),
-    NAME_FUNC_OFFSET(27967, glGetBooleani_v, glGetBooleani_v, NULL, 585),
-    NAME_FUNC_OFFSET(27991, glGetFragDataLocation, glGetFragDataLocation, NULL, 586),
-    NAME_FUNC_OFFSET(28016, glGetIntegeri_v, glGetIntegeri_v, NULL, 587),
-    NAME_FUNC_OFFSET(28040, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589),
-    NAME_FUNC_OFFSET(28064, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590),
-    NAME_FUNC_OFFSET(28089, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591),
-    NAME_FUNC_OFFSET(28122, glGetUniformuiv, glGetUniformuiv, NULL, 592),
-    NAME_FUNC_OFFSET(28141, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593),
-    NAME_FUNC_OFFSET(28165, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594),
-    NAME_FUNC_OFFSET(28190, glIsEnabledi, glIsEnabledi, NULL, 595),
-    NAME_FUNC_OFFSET(28212, glTexParameterIiv, glTexParameterIiv, NULL, 596),
-    NAME_FUNC_OFFSET(28233, glTexParameterIuiv, glTexParameterIuiv, NULL, 597),
-    NAME_FUNC_OFFSET(28255, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598),
-    NAME_FUNC_OFFSET(28286, glUniform1ui, glUniform1ui, NULL, 599),
-    NAME_FUNC_OFFSET(28302, glUniform1uiv, glUniform1uiv, NULL, 600),
-    NAME_FUNC_OFFSET(28319, glUniform2ui, glUniform2ui, NULL, 601),
-    NAME_FUNC_OFFSET(28335, glUniform2uiv, glUniform2uiv, NULL, 602),
-    NAME_FUNC_OFFSET(28352, glUniform3ui, glUniform3ui, NULL, 603),
-    NAME_FUNC_OFFSET(28368, glUniform3uiv, glUniform3uiv, NULL, 604),
-    NAME_FUNC_OFFSET(28385, glUniform4ui, glUniform4ui, NULL, 605),
-    NAME_FUNC_OFFSET(28401, glUniform4uiv, glUniform4uiv, NULL, 606),
-    NAME_FUNC_OFFSET(28418, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607),
-    NAME_FUNC_OFFSET(28440, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608),
-    NAME_FUNC_OFFSET(28463, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609),
-    NAME_FUNC_OFFSET(28485, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610),
-    NAME_FUNC_OFFSET(28507, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611),
-    NAME_FUNC_OFFSET(28530, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612),
-    NAME_FUNC_OFFSET(28553, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613),
-    NAME_FUNC_OFFSET(28579, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614),
-    NAME_FUNC_OFFSET(28605, glTexBuffer, glTexBuffer, NULL, 615),
-    NAME_FUNC_OFFSET(28620, glFramebufferTexture, glFramebufferTexture, NULL, 616),
-    NAME_FUNC_OFFSET(28644, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619),
-    NAME_FUNC_OFFSET(28669, glMinSampleShading, glMinSampleShading, NULL, 620),
-    NAME_FUNC_OFFSET(28691, glBindProgramARB, glBindProgramARB, NULL, 621),
-    NAME_FUNC_OFFSET(28707, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 622),
-    NAME_FUNC_OFFSET(28726, glGenProgramsARB, glGenProgramsARB, NULL, 623),
-    NAME_FUNC_OFFSET(28742, glIsProgramARB, glIsProgramARB, NULL, 630),
-    NAME_FUNC_OFFSET(28756, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 631),
-    NAME_FUNC_OFFSET(28779, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 632),
-    NAME_FUNC_OFFSET(28803, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 633),
-    NAME_FUNC_OFFSET(28826, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 634),
-    NAME_FUNC_OFFSET(28850, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 640),
-    NAME_FUNC_OFFSET(28867, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 641),
-    NAME_FUNC_OFFSET(28885, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 642),
-    NAME_FUNC_OFFSET(28902, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 643),
-    NAME_FUNC_OFFSET(28920, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 644),
-    NAME_FUNC_OFFSET(28937, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 645),
-    NAME_FUNC_OFFSET(28955, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 646),
-    NAME_FUNC_OFFSET(28972, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 647),
-    NAME_FUNC_OFFSET(28990, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
-    NAME_FUNC_OFFSET(29015, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
-    NAME_FUNC_OFFSET(29037, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
-    NAME_FUNC_OFFSET(29064, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
-    NAME_FUNC_OFFSET(29088, glBindFramebuffer, glBindFramebuffer, NULL, 660),
-    NAME_FUNC_OFFSET(29109, glBindRenderbuffer, glBindRenderbuffer, NULL, 661),
-    NAME_FUNC_OFFSET(29131, glBlitFramebuffer, glBlitFramebuffer, NULL, 662),
-    NAME_FUNC_OFFSET(29152, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
-    NAME_FUNC_OFFSET(29180, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
-    NAME_FUNC_OFFSET(29208, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
-    NAME_FUNC_OFFSET(29232, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
-    NAME_FUNC_OFFSET(29256, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
-    NAME_FUNC_OFFSET(29281, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
-    NAME_FUNC_OFFSET(29306, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
-    NAME_FUNC_OFFSET(29335, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
-    NAME_FUNC_OFFSET(29364, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 667),
-    NAME_FUNC_OFFSET(29390, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
-    NAME_FUNC_OFFSET(29416, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
-    NAME_FUNC_OFFSET(29442, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
-    NAME_FUNC_OFFSET(29468, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
-    NAME_FUNC_OFFSET(29494, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
-    NAME_FUNC_OFFSET(29523, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
-    NAME_FUNC_OFFSET(29552, glGenFramebuffers, glGenFramebuffers, NULL, 671),
-    NAME_FUNC_OFFSET(29573, glGenFramebuffers, glGenFramebuffers, NULL, 671),
-    NAME_FUNC_OFFSET(29594, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
-    NAME_FUNC_OFFSET(29616, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
-    NAME_FUNC_OFFSET(29638, glGenerateMipmap, glGenerateMipmap, NULL, 673),
-    NAME_FUNC_OFFSET(29658, glGenerateMipmap, glGenerateMipmap, NULL, 673),
-    NAME_FUNC_OFFSET(29678, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
-    NAME_FUNC_OFFSET(29719, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
-    NAME_FUNC_OFFSET(29760, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
-    NAME_FUNC_OFFSET(29792, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
-    NAME_FUNC_OFFSET(29824, glIsFramebuffer, glIsFramebuffer, NULL, 676),
-    NAME_FUNC_OFFSET(29843, glIsFramebuffer, glIsFramebuffer, NULL, 676),
-    NAME_FUNC_OFFSET(29862, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
-    NAME_FUNC_OFFSET(29882, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
-    NAME_FUNC_OFFSET(29902, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
-    NAME_FUNC_OFFSET(29927, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
-    NAME_FUNC_OFFSET(29952, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 679),
-    NAME_FUNC_OFFSET(29988, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 681),
-    NAME_FUNC_OFFSET(30016, glMapBufferRange, glMapBufferRange, NULL, 682),
-    NAME_FUNC_OFFSET(30036, glBindVertexArray, glBindVertexArray, NULL, 683),
-    NAME_FUNC_OFFSET(30057, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
-    NAME_FUNC_OFFSET(30083, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
-    NAME_FUNC_OFFSET(30107, glGenVertexArrays, glGenVertexArrays, NULL, 685),
-    NAME_FUNC_OFFSET(30128, glIsVertexArray, glIsVertexArray, NULL, 686),
-    NAME_FUNC_OFFSET(30149, glIsVertexArray, glIsVertexArray, NULL, 686),
-    NAME_FUNC_OFFSET(30168, glProvokingVertex, glProvokingVertex, NULL, 706),
-    NAME_FUNC_OFFSET(30189, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
-    NAME_FUNC_OFFSET(30223, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
-    NAME_FUNC_OFFSET(30248, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
-    NAME_FUNC_OFFSET(30274, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
-    NAME_FUNC_OFFSET(30291, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
-    NAME_FUNC_OFFSET(30321, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
-    NAME_FUNC_OFFSET(30342, glBlendFunciARB, glBlendFunciARB, NULL, 714),
-    NAME_FUNC_OFFSET(30364, glBlendFunciARB, glBlendFunciARB, NULL, 714),
-    NAME_FUNC_OFFSET(30377, gl_dispatch_stub_731, gl_dispatch_stub_731, NULL, 731),
-    NAME_FUNC_OFFSET(30401, gl_dispatch_stub_732, gl_dispatch_stub_732, NULL, 732),
-    NAME_FUNC_OFFSET(30426, glClearDepthf, glClearDepthf, NULL, 803),
-    NAME_FUNC_OFFSET(30443, glDepthRangef, glDepthRangef, NULL, 804),
-    NAME_FUNC_OFFSET(30460, glGetProgramBinary, glGetProgramBinary, NULL, 808),
-    NAME_FUNC_OFFSET(30482, glProgramBinary, glProgramBinary, NULL, 809),
-    NAME_FUNC_OFFSET(30501, glProgramParameteri, glProgramParameteri, NULL, 810),
-    NAME_FUNC_OFFSET(30524, glProgramParameteri, glProgramParameteri, NULL, 810),
-    NAME_FUNC_OFFSET(30547, gl_dispatch_stub_932, gl_dispatch_stub_932, NULL, 932),
-    NAME_FUNC_OFFSET(30563, gl_dispatch_stub_933, gl_dispatch_stub_933, NULL, 933),
-    NAME_FUNC_OFFSET(30582, gl_dispatch_stub_941, gl_dispatch_stub_941, NULL, 941),
-    NAME_FUNC_OFFSET(30607, gl_dispatch_stub_942, gl_dispatch_stub_942, NULL, 942),
-    NAME_FUNC_OFFSET(30632, gl_dispatch_stub_943, gl_dispatch_stub_943, NULL, 943),
-    NAME_FUNC_OFFSET(30658, gl_dispatch_stub_944, gl_dispatch_stub_944, NULL, 944),
-    NAME_FUNC_OFFSET(30686, gl_dispatch_stub_945, gl_dispatch_stub_945, NULL, 945),
-    NAME_FUNC_OFFSET(30711, gl_dispatch_stub_946, gl_dispatch_stub_946, NULL, 946),
-    NAME_FUNC_OFFSET(30742, gl_dispatch_stub_947, gl_dispatch_stub_947, NULL, 947),
-    NAME_FUNC_OFFSET(30768, gl_dispatch_stub_948, gl_dispatch_stub_948, NULL, 948),
-    NAME_FUNC_OFFSET(30791, gl_dispatch_stub_952, gl_dispatch_stub_952, NULL, 952),
-    NAME_FUNC_OFFSET(30813, gl_dispatch_stub_953, gl_dispatch_stub_953, NULL, 953),
-    NAME_FUNC_OFFSET(30836, gl_dispatch_stub_954, gl_dispatch_stub_954, NULL, 954),
-    NAME_FUNC_OFFSET(30858, gl_dispatch_stub_955, gl_dispatch_stub_955, NULL, 955),
-    NAME_FUNC_OFFSET(30881, gl_dispatch_stub_956, gl_dispatch_stub_956, NULL, 956),
-    NAME_FUNC_OFFSET(30904, gl_dispatch_stub_957, gl_dispatch_stub_957, NULL, 957),
-    NAME_FUNC_OFFSET(30928, gl_dispatch_stub_960, gl_dispatch_stub_960, NULL, 960),
-    NAME_FUNC_OFFSET(30950, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
-    NAME_FUNC_OFFSET(30973, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
-    NAME_FUNC_OFFSET(30995, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
-    NAME_FUNC_OFFSET(31018, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
-    NAME_FUNC_OFFSET(31041, gl_dispatch_stub_965, gl_dispatch_stub_965, NULL, 965),
-    NAME_FUNC_OFFSET(31065, gl_dispatch_stub_968, gl_dispatch_stub_968, NULL, 968),
-    NAME_FUNC_OFFSET(31087, gl_dispatch_stub_969, gl_dispatch_stub_969, NULL, 969),
-    NAME_FUNC_OFFSET(31110, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL, 970),
-    NAME_FUNC_OFFSET(31132, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
-    NAME_FUNC_OFFSET(31155, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
-    NAME_FUNC_OFFSET(31178, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
-    NAME_FUNC_OFFSET(31202, gl_dispatch_stub_976, gl_dispatch_stub_976, NULL, 976),
-    NAME_FUNC_OFFSET(31224, gl_dispatch_stub_977, gl_dispatch_stub_977, NULL, 977),
-    NAME_FUNC_OFFSET(31247, gl_dispatch_stub_978, gl_dispatch_stub_978, NULL, 978),
-    NAME_FUNC_OFFSET(31269, gl_dispatch_stub_979, gl_dispatch_stub_979, NULL, 979),
-    NAME_FUNC_OFFSET(31292, gl_dispatch_stub_980, gl_dispatch_stub_980, NULL, 980),
-    NAME_FUNC_OFFSET(31315, gl_dispatch_stub_981, gl_dispatch_stub_981, NULL, 981),
-    NAME_FUNC_OFFSET(31339, gl_dispatch_stub_983, gl_dispatch_stub_983, NULL, 983),
-    NAME_FUNC_OFFSET(31368, gl_dispatch_stub_985, gl_dispatch_stub_985, NULL, 985),
-    NAME_FUNC_OFFSET(31399, gl_dispatch_stub_987, gl_dispatch_stub_987, NULL, 987),
-    NAME_FUNC_OFFSET(31430, gl_dispatch_stub_989, gl_dispatch_stub_989, NULL, 989),
-    NAME_FUNC_OFFSET(31459, gl_dispatch_stub_991, gl_dispatch_stub_991, NULL, 991),
-    NAME_FUNC_OFFSET(31490, gl_dispatch_stub_993, gl_dispatch_stub_993, NULL, 993),
-    NAME_FUNC_OFFSET(31521, gl_dispatch_stub_995, gl_dispatch_stub_995, NULL, 995),
-    NAME_FUNC_OFFSET(31550, gl_dispatch_stub_997, gl_dispatch_stub_997, NULL, 997),
-    NAME_FUNC_OFFSET(31581, gl_dispatch_stub_999, gl_dispatch_stub_999, NULL, 999),
-    NAME_FUNC_OFFSET(31612, gl_dispatch_stub_1001, gl_dispatch_stub_1001, NULL, 1001),
-    NAME_FUNC_OFFSET(31634, gl_dispatch_stub_1002, gl_dispatch_stub_1002, NULL, 1002),
-    NAME_FUNC_OFFSET(31663, glDebugMessageCallback, glDebugMessageCallback, NULL, 1003),
-    NAME_FUNC_OFFSET(31689, glDebugMessageControl, glDebugMessageControl, NULL, 1004),
-    NAME_FUNC_OFFSET(31714, glDebugMessageInsert, glDebugMessageInsert, NULL, 1005),
-    NAME_FUNC_OFFSET(31738, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 1006),
-    NAME_FUNC_OFFSET(31762, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 1013),
-    NAME_FUNC_OFFSET(31781, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 1014),
-    NAME_FUNC_OFFSET(31801, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 1015),
-    NAME_FUNC_OFFSET(31821, glFogCoordfEXT, glFogCoordfEXT, NULL, 1016),
-    NAME_FUNC_OFFSET(31833, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 1017),
-    NAME_FUNC_OFFSET(31846, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1120),
-    NAME_FUNC_OFFSET(31864, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1121),
-    NAME_FUNC_OFFSET(31883, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1122),
-    NAME_FUNC_OFFSET(31901, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1123),
-    NAME_FUNC_OFFSET(31920, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1124),
-    NAME_FUNC_OFFSET(31939, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1125),
-    NAME_FUNC_OFFSET(31959, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1126),
-    NAME_FUNC_OFFSET(31977, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1127),
-    NAME_FUNC_OFFSET(31996, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1128),
-    NAME_FUNC_OFFSET(32015, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1129),
-    NAME_FUNC_OFFSET(32035, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1130),
-    NAME_FUNC_OFFSET(32053, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1131),
-    NAME_FUNC_OFFSET(32072, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1132),
-    NAME_FUNC_OFFSET(32091, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1133),
-    NAME_FUNC_OFFSET(32111, glTextureBarrierNV, glTextureBarrierNV, NULL, 1154),
-    NAME_FUNC_OFFSET(32128, glAlphaFuncx, glAlphaFuncx, NULL, 1181),
-    NAME_FUNC_OFFSET(32144, glClearColorx, glClearColorx, NULL, 1182),
-    NAME_FUNC_OFFSET(32161, glClearDepthx, glClearDepthx, NULL, 1183),
-    NAME_FUNC_OFFSET(32178, glColor4x, glColor4x, NULL, 1184),
-    NAME_FUNC_OFFSET(32191, glDepthRangex, glDepthRangex, NULL, 1185),
-    NAME_FUNC_OFFSET(32208, glFogx, glFogx, NULL, 1186),
-    NAME_FUNC_OFFSET(32218, glFogxv, glFogxv, NULL, 1187),
-    NAME_FUNC_OFFSET(32229, glFrustumf, glFrustumf, NULL, 1188),
-    NAME_FUNC_OFFSET(32243, glFrustumx, glFrustumx, NULL, 1189),
-    NAME_FUNC_OFFSET(32257, glLightModelx, glLightModelx, NULL, 1190),
-    NAME_FUNC_OFFSET(32274, glLightModelxv, glLightModelxv, NULL, 1191),
-    NAME_FUNC_OFFSET(32292, glLightx, glLightx, NULL, 1192),
-    NAME_FUNC_OFFSET(32304, glLightxv, glLightxv, NULL, 1193),
-    NAME_FUNC_OFFSET(32317, glLineWidthx, glLineWidthx, NULL, 1194),
-    NAME_FUNC_OFFSET(32333, glLoadMatrixx, glLoadMatrixx, NULL, 1195),
-    NAME_FUNC_OFFSET(32350, glMaterialx, glMaterialx, NULL, 1196),
-    NAME_FUNC_OFFSET(32365, glMaterialxv, glMaterialxv, NULL, 1197),
-    NAME_FUNC_OFFSET(32381, glMultMatrixx, glMultMatrixx, NULL, 1198),
-    NAME_FUNC_OFFSET(32398, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1199),
-    NAME_FUNC_OFFSET(32419, glNormal3x, glNormal3x, NULL, 1200),
-    NAME_FUNC_OFFSET(32433, glOrthof, glOrthof, NULL, 1201),
-    NAME_FUNC_OFFSET(32445, glOrthox, glOrthox, NULL, 1202),
-    NAME_FUNC_OFFSET(32457, glPointSizex, glPointSizex, NULL, 1203),
-    NAME_FUNC_OFFSET(32473, glPolygonOffsetx, glPolygonOffsetx, NULL, 1204),
-    NAME_FUNC_OFFSET(32493, glRotatex, glRotatex, NULL, 1205),
-    NAME_FUNC_OFFSET(32506, glSampleCoveragex, glSampleCoveragex, NULL, 1206),
-    NAME_FUNC_OFFSET(32527, glScalex, glScalex, NULL, 1207),
-    NAME_FUNC_OFFSET(32539, glTexEnvx, glTexEnvx, NULL, 1208),
-    NAME_FUNC_OFFSET(32552, glTexEnvxv, glTexEnvxv, NULL, 1209),
-    NAME_FUNC_OFFSET(32566, glTexParameterx, glTexParameterx, NULL, 1210),
-    NAME_FUNC_OFFSET(32585, glTranslatex, glTranslatex, NULL, 1211),
-    NAME_FUNC_OFFSET(32601, glClipPlanef, glClipPlanef, NULL, 1212),
-    NAME_FUNC_OFFSET(32617, glClipPlanex, glClipPlanex, NULL, 1213),
-    NAME_FUNC_OFFSET(32633, glGetClipPlanef, glGetClipPlanef, NULL, 1214),
-    NAME_FUNC_OFFSET(32652, glGetClipPlanex, glGetClipPlanex, NULL, 1215),
-    NAME_FUNC_OFFSET(32671, glGetFixedv, glGetFixedv, NULL, 1216),
-    NAME_FUNC_OFFSET(32686, glGetLightxv, glGetLightxv, NULL, 1217),
-    NAME_FUNC_OFFSET(32702, glGetMaterialxv, glGetMaterialxv, NULL, 1218),
-    NAME_FUNC_OFFSET(32721, glGetTexEnvxv, glGetTexEnvxv, NULL, 1219),
-    NAME_FUNC_OFFSET(32738, glGetTexParameterxv, glGetTexParameterxv, NULL, 1220),
-    NAME_FUNC_OFFSET(32761, glPointParameterx, glPointParameterx, NULL, 1221),
-    NAME_FUNC_OFFSET(32782, glPointParameterxv, glPointParameterxv, NULL, 1222),
-    NAME_FUNC_OFFSET(32804, glTexParameterxv, glTexParameterxv, NULL, 1223),
+    NAME_FUNC_OFFSET(14856, glClearNamedBufferData, glClearNamedBufferData, NULL, 884),
+    NAME_FUNC_OFFSET(14879, glClearNamedBufferSubData, glClearNamedBufferSubData, NULL, 885),
+    NAME_FUNC_OFFSET(14905, glCompressedTextureSubImage1D, glCompressedTextureSubImage1D, NULL, 886),
+    NAME_FUNC_OFFSET(14935, glCompressedTextureSubImage2D, glCompressedTextureSubImage2D, NULL, 887),
+    NAME_FUNC_OFFSET(14965, glCompressedTextureSubImage3D, glCompressedTextureSubImage3D, NULL, 888),
+    NAME_FUNC_OFFSET(14995, glCopyNamedBufferSubData, glCopyNamedBufferSubData, NULL, 889),
+    NAME_FUNC_OFFSET(15020, glCopyTextureSubImage1D, glCopyTextureSubImage1D, NULL, 890),
+    NAME_FUNC_OFFSET(15044, glCopyTextureSubImage2D, glCopyTextureSubImage2D, NULL, 891),
+    NAME_FUNC_OFFSET(15068, glCopyTextureSubImage3D, glCopyTextureSubImage3D, NULL, 892),
+    NAME_FUNC_OFFSET(15092, glCreateBuffers, glCreateBuffers, NULL, 893),
+    NAME_FUNC_OFFSET(15108, glCreateTextures, glCreateTextures, NULL, 894),
+    NAME_FUNC_OFFSET(15125, glFlushMappedNamedBufferRange, glFlushMappedNamedBufferRange, NULL, 895),
+    NAME_FUNC_OFFSET(15155, glGenerateTextureMipmap, glGenerateTextureMipmap, NULL, 896),
+    NAME_FUNC_OFFSET(15179, glGetCompressedTextureImage, glGetCompressedTextureImage, NULL, 897),
+    NAME_FUNC_OFFSET(15207, glGetNamedBufferParameteri64v, glGetNamedBufferParameteri64v, NULL, 898),
+    NAME_FUNC_OFFSET(15237, glGetNamedBufferParameteriv, glGetNamedBufferParameteriv, NULL, 899),
+    NAME_FUNC_OFFSET(15265, glGetNamedBufferPointerv, glGetNamedBufferPointerv, NULL, 900),
+    NAME_FUNC_OFFSET(15290, glGetNamedBufferSubData, glGetNamedBufferSubData, NULL, 901),
+    NAME_FUNC_OFFSET(15314, glGetTextureImage, glGetTextureImage, NULL, 902),
+    NAME_FUNC_OFFSET(15332, glGetTextureLevelParameterfv, glGetTextureLevelParameterfv, NULL, 903),
+    NAME_FUNC_OFFSET(15361, glGetTextureLevelParameteriv, glGetTextureLevelParameteriv, NULL, 904),
+    NAME_FUNC_OFFSET(15390, glGetTextureParameterIiv, glGetTextureParameterIiv, NULL, 905),
+    NAME_FUNC_OFFSET(15415, glGetTextureParameterIuiv, glGetTextureParameterIuiv, NULL, 906),
+    NAME_FUNC_OFFSET(15441, glGetTextureParameterfv, glGetTextureParameterfv, NULL, 907),
+    NAME_FUNC_OFFSET(15465, glGetTextureParameteriv, glGetTextureParameteriv, NULL, 908),
+    NAME_FUNC_OFFSET(15489, glMapNamedBuffer, glMapNamedBuffer, NULL, 909),
+    NAME_FUNC_OFFSET(15506, glMapNamedBufferRange, glMapNamedBufferRange, NULL, 910),
+    NAME_FUNC_OFFSET(15528, glNamedBufferData, glNamedBufferData, NULL, 911),
+    NAME_FUNC_OFFSET(15546, glNamedBufferStorage, glNamedBufferStorage, NULL, 912),
+    NAME_FUNC_OFFSET(15567, glNamedBufferSubData, glNamedBufferSubData, NULL, 913),
+    NAME_FUNC_OFFSET(15588, glTextureBuffer, glTextureBuffer, NULL, 914),
+    NAME_FUNC_OFFSET(15604, glTextureBufferRange, glTextureBufferRange, NULL, 915),
+    NAME_FUNC_OFFSET(15625, glTextureParameterIiv, glTextureParameterIiv, NULL, 916),
+    NAME_FUNC_OFFSET(15647, glTextureParameterIuiv, glTextureParameterIuiv, NULL, 917),
+    NAME_FUNC_OFFSET(15670, glTextureParameterf, glTextureParameterf, NULL, 918),
+    NAME_FUNC_OFFSET(15690, glTextureParameterfv, glTextureParameterfv, NULL, 919),
+    NAME_FUNC_OFFSET(15711, glTextureParameteri, glTextureParameteri, NULL, 920),
+    NAME_FUNC_OFFSET(15731, glTextureParameteriv, glTextureParameteriv, NULL, 921),
+    NAME_FUNC_OFFSET(15752, glTextureStorage1D, glTextureStorage1D, NULL, 922),
+    NAME_FUNC_OFFSET(15771, glTextureStorage2D, glTextureStorage2D, NULL, 923),
+    NAME_FUNC_OFFSET(15790, glTextureStorage2DMultisample, glTextureStorage2DMultisample, NULL, 924),
+    NAME_FUNC_OFFSET(15820, glTextureStorage3D, glTextureStorage3D, NULL, 925),
+    NAME_FUNC_OFFSET(15839, glTextureStorage3DMultisample, glTextureStorage3DMultisample, NULL, 926),
+    NAME_FUNC_OFFSET(15869, glTextureSubImage1D, glTextureSubImage1D, NULL, 927),
+    NAME_FUNC_OFFSET(15889, glTextureSubImage2D, glTextureSubImage2D, NULL, 928),
+    NAME_FUNC_OFFSET(15909, glTextureSubImage3D, glTextureSubImage3D, NULL, 929),
+    NAME_FUNC_OFFSET(15929, glUnmapNamedBuffer, glUnmapNamedBuffer, NULL, 930),
+    NAME_FUNC_OFFSET(15948, glInvalidateBufferData, glInvalidateBufferData, NULL, 931),
+    NAME_FUNC_OFFSET(15971, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 932),
+    NAME_FUNC_OFFSET(15997, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 933),
+    NAME_FUNC_OFFSET(16021, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 934),
+    NAME_FUNC_OFFSET(16048, glInvalidateTexImage, glInvalidateTexImage, NULL, 935),
+    NAME_FUNC_OFFSET(16069, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 936),
+    NAME_FUNC_OFFSET(16093, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 937),
+    NAME_FUNC_OFFSET(16112, gl_dispatch_stub_938, gl_dispatch_stub_938, NULL, 938),
+    NAME_FUNC_OFFSET(16126, gl_dispatch_stub_939, gl_dispatch_stub_939, NULL, 939),
+    NAME_FUNC_OFFSET(16141, gl_dispatch_stub_940, gl_dispatch_stub_940, NULL, 940),
+    NAME_FUNC_OFFSET(16155, gl_dispatch_stub_941, gl_dispatch_stub_941, NULL, 941),
+    NAME_FUNC_OFFSET(16170, gl_dispatch_stub_942, gl_dispatch_stub_942, NULL, 942),
+    NAME_FUNC_OFFSET(16184, gl_dispatch_stub_943, gl_dispatch_stub_943, NULL, 943),
+    NAME_FUNC_OFFSET(16199, gl_dispatch_stub_944, gl_dispatch_stub_944, NULL, 944),
+    NAME_FUNC_OFFSET(16213, gl_dispatch_stub_945, gl_dispatch_stub_945, NULL, 945),
+    NAME_FUNC_OFFSET(16228, glPointSizePointerOES, glPointSizePointerOES, NULL, 946),
+    NAME_FUNC_OFFSET(16250, gl_dispatch_stub_947, gl_dispatch_stub_947, NULL, 947),
+    NAME_FUNC_OFFSET(16268, gl_dispatch_stub_948, gl_dispatch_stub_948, NULL, 948),
+    NAME_FUNC_OFFSET(16285, gl_dispatch_stub_949, gl_dispatch_stub_949, NULL, 949),
+    NAME_FUNC_OFFSET(16305, glColorPointerEXT, glColorPointerEXT, NULL, 950),
+    NAME_FUNC_OFFSET(16323, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 951),
+    NAME_FUNC_OFFSET(16344, glIndexPointerEXT, glIndexPointerEXT, NULL, 952),
+    NAME_FUNC_OFFSET(16362, glNormalPointerEXT, glNormalPointerEXT, NULL, 953),
+    NAME_FUNC_OFFSET(16381, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 954),
+    NAME_FUNC_OFFSET(16402, glVertexPointerEXT, glVertexPointerEXT, NULL, 955),
+    NAME_FUNC_OFFSET(16421, gl_dispatch_stub_956, gl_dispatch_stub_956, NULL, 956),
+    NAME_FUNC_OFFSET(16445, gl_dispatch_stub_957, gl_dispatch_stub_957, NULL, 957),
+    NAME_FUNC_OFFSET(16467, gl_dispatch_stub_958, gl_dispatch_stub_958, NULL, 958),
+    NAME_FUNC_OFFSET(16489, gl_dispatch_stub_959, gl_dispatch_stub_959, NULL, 959),
+    NAME_FUNC_OFFSET(16512, gl_dispatch_stub_960, gl_dispatch_stub_960, NULL, 960),
+    NAME_FUNC_OFFSET(16537, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
+    NAME_FUNC_OFFSET(16559, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
+    NAME_FUNC_OFFSET(16587, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
+    NAME_FUNC_OFFSET(16610, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
+    NAME_FUNC_OFFSET(16630, glLockArraysEXT, glLockArraysEXT, NULL, 965),
+    NAME_FUNC_OFFSET(16646, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL, 966),
+    NAME_FUNC_OFFSET(16665, gl_dispatch_stub_967, gl_dispatch_stub_967, NULL, 967),
+    NAME_FUNC_OFFSET(16685, gl_dispatch_stub_968, gl_dispatch_stub_968, NULL, 968),
+    NAME_FUNC_OFFSET(16704, gl_dispatch_stub_969, gl_dispatch_stub_969, NULL, 969),
+    NAME_FUNC_OFFSET(16724, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL, 970),
+    NAME_FUNC_OFFSET(16743, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
+    NAME_FUNC_OFFSET(16763, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
+    NAME_FUNC_OFFSET(16783, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
+    NAME_FUNC_OFFSET(16804, gl_dispatch_stub_974, gl_dispatch_stub_974, NULL, 974),
+    NAME_FUNC_OFFSET(16823, gl_dispatch_stub_975, gl_dispatch_stub_975, NULL, 975),
+    NAME_FUNC_OFFSET(16843, gl_dispatch_stub_976, gl_dispatch_stub_976, NULL, 976),
+    NAME_FUNC_OFFSET(16862, gl_dispatch_stub_977, gl_dispatch_stub_977, NULL, 977),
+    NAME_FUNC_OFFSET(16882, gl_dispatch_stub_978, gl_dispatch_stub_978, NULL, 978),
+    NAME_FUNC_OFFSET(16901, gl_dispatch_stub_979, gl_dispatch_stub_979, NULL, 979),
+    NAME_FUNC_OFFSET(16921, gl_dispatch_stub_980, gl_dispatch_stub_980, NULL, 980),
+    NAME_FUNC_OFFSET(16941, gl_dispatch_stub_981, gl_dispatch_stub_981, NULL, 981),
+    NAME_FUNC_OFFSET(16962, gl_dispatch_stub_982, gl_dispatch_stub_982, NULL, 982),
+    NAME_FUNC_OFFSET(16981, gl_dispatch_stub_983, gl_dispatch_stub_983, NULL, 983),
+    NAME_FUNC_OFFSET(17001, gl_dispatch_stub_984, gl_dispatch_stub_984, NULL, 984),
+    NAME_FUNC_OFFSET(17020, gl_dispatch_stub_985, gl_dispatch_stub_985, NULL, 985),
+    NAME_FUNC_OFFSET(17040, gl_dispatch_stub_986, gl_dispatch_stub_986, NULL, 986),
+    NAME_FUNC_OFFSET(17059, gl_dispatch_stub_987, gl_dispatch_stub_987, NULL, 987),
+    NAME_FUNC_OFFSET(17079, gl_dispatch_stub_988, gl_dispatch_stub_988, NULL, 988),
+    NAME_FUNC_OFFSET(17099, gl_dispatch_stub_989, gl_dispatch_stub_989, NULL, 989),
+    NAME_FUNC_OFFSET(17120, gl_dispatch_stub_990, gl_dispatch_stub_990, NULL, 990),
+    NAME_FUNC_OFFSET(17139, gl_dispatch_stub_991, gl_dispatch_stub_991, NULL, 991),
+    NAME_FUNC_OFFSET(17159, gl_dispatch_stub_992, gl_dispatch_stub_992, NULL, 992),
+    NAME_FUNC_OFFSET(17178, gl_dispatch_stub_993, gl_dispatch_stub_993, NULL, 993),
+    NAME_FUNC_OFFSET(17198, gl_dispatch_stub_994, gl_dispatch_stub_994, NULL, 994),
+    NAME_FUNC_OFFSET(17217, gl_dispatch_stub_995, gl_dispatch_stub_995, NULL, 995),
+    NAME_FUNC_OFFSET(17237, gl_dispatch_stub_996, gl_dispatch_stub_996, NULL, 996),
+    NAME_FUNC_OFFSET(17257, gl_dispatch_stub_997, gl_dispatch_stub_997, NULL, 997),
+    NAME_FUNC_OFFSET(17278, gl_dispatch_stub_998, gl_dispatch_stub_998, NULL, 998),
+    NAME_FUNC_OFFSET(17304, gl_dispatch_stub_999, gl_dispatch_stub_999, NULL, 999),
+    NAME_FUNC_OFFSET(17330, gl_dispatch_stub_1000, gl_dispatch_stub_1000, NULL, 1000),
+    NAME_FUNC_OFFSET(17358, gl_dispatch_stub_1001, gl_dispatch_stub_1001, NULL, 1001),
+    NAME_FUNC_OFFSET(17386, gl_dispatch_stub_1002, gl_dispatch_stub_1002, NULL, 1002),
+    NAME_FUNC_OFFSET(17414, gl_dispatch_stub_1003, gl_dispatch_stub_1003, NULL, 1003),
+    NAME_FUNC_OFFSET(17442, gl_dispatch_stub_1004, gl_dispatch_stub_1004, NULL, 1004),
+    NAME_FUNC_OFFSET(17468, gl_dispatch_stub_1005, gl_dispatch_stub_1005, NULL, 1005),
+    NAME_FUNC_OFFSET(17494, gl_dispatch_stub_1006, gl_dispatch_stub_1006, NULL, 1006),
+    NAME_FUNC_OFFSET(17522, gl_dispatch_stub_1007, gl_dispatch_stub_1007, NULL, 1007),
+    NAME_FUNC_OFFSET(17550, gl_dispatch_stub_1008, gl_dispatch_stub_1008, NULL, 1008),
+    NAME_FUNC_OFFSET(17578, gl_dispatch_stub_1009, gl_dispatch_stub_1009, NULL, 1009),
+    NAME_FUNC_OFFSET(17606, gl_dispatch_stub_1010, gl_dispatch_stub_1010, NULL, 1010),
+    NAME_FUNC_OFFSET(17632, gl_dispatch_stub_1011, gl_dispatch_stub_1011, NULL, 1011),
+    NAME_FUNC_OFFSET(17658, gl_dispatch_stub_1012, gl_dispatch_stub_1012, NULL, 1012),
+    NAME_FUNC_OFFSET(17686, gl_dispatch_stub_1013, gl_dispatch_stub_1013, NULL, 1013),
+    NAME_FUNC_OFFSET(17714, gl_dispatch_stub_1014, gl_dispatch_stub_1014, NULL, 1014),
+    NAME_FUNC_OFFSET(17742, gl_dispatch_stub_1015, gl_dispatch_stub_1015, NULL, 1015),
+    NAME_FUNC_OFFSET(17770, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 1016),
+    NAME_FUNC_OFFSET(17788, gl_dispatch_stub_1017, gl_dispatch_stub_1017, NULL, 1017),
+    NAME_FUNC_OFFSET(17807, gl_dispatch_stub_1018, gl_dispatch_stub_1018, NULL, 1018),
+    NAME_FUNC_OFFSET(17833, glDebugMessageCallback, glDebugMessageCallback, NULL, 1019),
+    NAME_FUNC_OFFSET(17856, glDebugMessageControl, glDebugMessageControl, NULL, 1020),
+    NAME_FUNC_OFFSET(17878, glDebugMessageInsert, glDebugMessageInsert, NULL, 1021),
+    NAME_FUNC_OFFSET(17899, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 1022),
+    NAME_FUNC_OFFSET(17920, glGetObjectLabel, glGetObjectLabel, NULL, 1023),
+    NAME_FUNC_OFFSET(17937, glGetObjectPtrLabel, glGetObjectPtrLabel, NULL, 1024),
+    NAME_FUNC_OFFSET(17957, glObjectLabel, glObjectLabel, NULL, 1025),
+    NAME_FUNC_OFFSET(17971, glObjectPtrLabel, glObjectPtrLabel, NULL, 1026),
+    NAME_FUNC_OFFSET(17988, glPopDebugGroup, glPopDebugGroup, NULL, 1027),
+    NAME_FUNC_OFFSET(18004, glPushDebugGroup, glPushDebugGroup, NULL, 1028),
+    NAME_FUNC_OFFSET(18021, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 1029),
+    NAME_FUNC_OFFSET(18043, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 1030),
+    NAME_FUNC_OFFSET(18066, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 1031),
+    NAME_FUNC_OFFSET(18089, glFogCoordfEXT, glFogCoordfEXT, NULL, 1032),
+    NAME_FUNC_OFFSET(18104, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 1033),
+    NAME_FUNC_OFFSET(18120, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 1034),
+    NAME_FUNC_OFFSET(18140, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 1035),
+    NAME_FUNC_OFFSET(18158, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 1036),
+    NAME_FUNC_OFFSET(18177, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 1037),
+    NAME_FUNC_OFFSET(18195, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 1038),
+    NAME_FUNC_OFFSET(18214, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 1039),
+    NAME_FUNC_OFFSET(18232, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 1040),
+    NAME_FUNC_OFFSET(18251, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 1041),
+    NAME_FUNC_OFFSET(18269, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 1042),
+    NAME_FUNC_OFFSET(18288, gl_dispatch_stub_1043, gl_dispatch_stub_1043, NULL, 1043),
+    NAME_FUNC_OFFSET(18313, gl_dispatch_stub_1044, gl_dispatch_stub_1044, NULL, 1044),
+    NAME_FUNC_OFFSET(18340, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 1045),
+    NAME_FUNC_OFFSET(18364, glExecuteProgramNV, glExecuteProgramNV, NULL, 1046),
+    NAME_FUNC_OFFSET(18383, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 1047),
+    NAME_FUNC_OFFSET(18409, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 1048),
+    NAME_FUNC_OFFSET(18435, glGetProgramStringNV, glGetProgramStringNV, NULL, 1049),
+    NAME_FUNC_OFFSET(18456, glGetProgramivNV, glGetProgramivNV, NULL, 1050),
+    NAME_FUNC_OFFSET(18473, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 1051),
+    NAME_FUNC_OFFSET(18494, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 1052),
+    NAME_FUNC_OFFSET(18516, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 1053),
+    NAME_FUNC_OFFSET(18538, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 1054),
+    NAME_FUNC_OFFSET(18560, glLoadProgramNV, glLoadProgramNV, NULL, 1055),
+    NAME_FUNC_OFFSET(18576, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 1056),
+    NAME_FUNC_OFFSET(18601, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 1057),
+    NAME_FUNC_OFFSET(18626, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 1058),
+    NAME_FUNC_OFFSET(18654, glTrackMatrixNV, glTrackMatrixNV, NULL, 1059),
+    NAME_FUNC_OFFSET(18670, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 1060),
+    NAME_FUNC_OFFSET(18689, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 1061),
+    NAME_FUNC_OFFSET(18709, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 1062),
+    NAME_FUNC_OFFSET(18728, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 1063),
+    NAME_FUNC_OFFSET(18748, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 1064),
+    NAME_FUNC_OFFSET(18767, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 1065),
+    NAME_FUNC_OFFSET(18787, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 1066),
+    NAME_FUNC_OFFSET(18806, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 1067),
+    NAME_FUNC_OFFSET(18826, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 1068),
+    NAME_FUNC_OFFSET(18845, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 1069),
+    NAME_FUNC_OFFSET(18865, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 1070),
+    NAME_FUNC_OFFSET(18884, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 1071),
+    NAME_FUNC_OFFSET(18904, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 1072),
+    NAME_FUNC_OFFSET(18923, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 1073),
+    NAME_FUNC_OFFSET(18943, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 1074),
+    NAME_FUNC_OFFSET(18962, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 1075),
+    NAME_FUNC_OFFSET(18982, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 1076),
+    NAME_FUNC_OFFSET(19001, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 1077),
+    NAME_FUNC_OFFSET(19021, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 1078),
+    NAME_FUNC_OFFSET(19040, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 1079),
+    NAME_FUNC_OFFSET(19060, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 1080),
+    NAME_FUNC_OFFSET(19079, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 1081),
+    NAME_FUNC_OFFSET(19099, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 1082),
+    NAME_FUNC_OFFSET(19118, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 1083),
+    NAME_FUNC_OFFSET(19138, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 1084),
+    NAME_FUNC_OFFSET(19158, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 1085),
+    NAME_FUNC_OFFSET(19179, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 1086),
+    NAME_FUNC_OFFSET(19203, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 1087),
+    NAME_FUNC_OFFSET(19224, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 1088),
+    NAME_FUNC_OFFSET(19245, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 1089),
+    NAME_FUNC_OFFSET(19266, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 1090),
+    NAME_FUNC_OFFSET(19287, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 1091),
+    NAME_FUNC_OFFSET(19308, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 1092),
+    NAME_FUNC_OFFSET(19329, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 1093),
+    NAME_FUNC_OFFSET(19350, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 1094),
+    NAME_FUNC_OFFSET(19371, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 1095),
+    NAME_FUNC_OFFSET(19392, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 1096),
+    NAME_FUNC_OFFSET(19413, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 1097),
+    NAME_FUNC_OFFSET(19434, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 1098),
+    NAME_FUNC_OFFSET(19455, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 1099),
+    NAME_FUNC_OFFSET(19477, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 1100),
+    NAME_FUNC_OFFSET(19504, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 1101),
+    NAME_FUNC_OFFSET(19531, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 1102),
+    NAME_FUNC_OFFSET(19555, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 1103),
+    NAME_FUNC_OFFSET(19579, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 1104),
+    NAME_FUNC_OFFSET(19601, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 1105),
+    NAME_FUNC_OFFSET(19623, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 1106),
+    NAME_FUNC_OFFSET(19645, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 1107),
+    NAME_FUNC_OFFSET(19670, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 1108),
+    NAME_FUNC_OFFSET(19694, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 1109),
+    NAME_FUNC_OFFSET(19716, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 1110),
+    NAME_FUNC_OFFSET(19738, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 1111),
+    NAME_FUNC_OFFSET(19760, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 1112),
+    NAME_FUNC_OFFSET(19786, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 1113),
+    NAME_FUNC_OFFSET(19809, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 1114),
+    NAME_FUNC_OFFSET(19833, glPassTexCoordATI, glPassTexCoordATI, NULL, 1115),
+    NAME_FUNC_OFFSET(19851, glSampleMapATI, glSampleMapATI, NULL, 1116),
+    NAME_FUNC_OFFSET(19866, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 1117),
+    NAME_FUNC_OFFSET(19897, gl_dispatch_stub_1118, gl_dispatch_stub_1118, NULL, 1118),
+    NAME_FUNC_OFFSET(19920, gl_dispatch_stub_1119, gl_dispatch_stub_1119, NULL, 1119),
+    NAME_FUNC_OFFSET(19943, gl_dispatch_stub_1120, gl_dispatch_stub_1120, NULL, 1120),
+    NAME_FUNC_OFFSET(19966, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 1121),
+    NAME_FUNC_OFFSET(19997, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 1122),
+    NAME_FUNC_OFFSET(20028, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 1123),
+    NAME_FUNC_OFFSET(20056, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 1124),
+    NAME_FUNC_OFFSET(20085, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 1125),
+    NAME_FUNC_OFFSET(20113, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 1126),
+    NAME_FUNC_OFFSET(20142, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 1127),
+    NAME_FUNC_OFFSET(20163, gl_dispatch_stub_1128, gl_dispatch_stub_1128, NULL, 1128),
+    NAME_FUNC_OFFSET(20180, gl_dispatch_stub_1129, gl_dispatch_stub_1129, NULL, 1129),
+    NAME_FUNC_OFFSET(20193, gl_dispatch_stub_1130, gl_dispatch_stub_1130, NULL, 1130),
+    NAME_FUNC_OFFSET(20207, gl_dispatch_stub_1131, gl_dispatch_stub_1131, NULL, 1131),
+    NAME_FUNC_OFFSET(20224, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 1132),
+    NAME_FUNC_OFFSET(20245, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 1133),
+    NAME_FUNC_OFFSET(20267, gl_dispatch_stub_1134, gl_dispatch_stub_1134, NULL, 1134),
+    NAME_FUNC_OFFSET(20291, gl_dispatch_stub_1135, gl_dispatch_stub_1135, NULL, 1135),
+    NAME_FUNC_OFFSET(20321, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1136),
+    NAME_FUNC_OFFSET(20342, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1137),
+    NAME_FUNC_OFFSET(20364, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1138),
+    NAME_FUNC_OFFSET(20385, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1139),
+    NAME_FUNC_OFFSET(20407, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1140),
+    NAME_FUNC_OFFSET(20429, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1141),
+    NAME_FUNC_OFFSET(20452, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1142),
+    NAME_FUNC_OFFSET(20473, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1143),
+    NAME_FUNC_OFFSET(20495, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1144),
+    NAME_FUNC_OFFSET(20517, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1145),
+    NAME_FUNC_OFFSET(20540, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1146),
+    NAME_FUNC_OFFSET(20561, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1147),
+    NAME_FUNC_OFFSET(20583, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1148),
+    NAME_FUNC_OFFSET(20605, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1149),
+    NAME_FUNC_OFFSET(20628, glClearColorIiEXT, glClearColorIiEXT, NULL, 1150),
+    NAME_FUNC_OFFSET(20646, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 1151),
+    NAME_FUNC_OFFSET(20665, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 1152),
+    NAME_FUNC_OFFSET(20687, glBeginPerfMonitorAMD, glBeginPerfMonitorAMD, NULL, 1153),
+    NAME_FUNC_OFFSET(20709, glDeletePerfMonitorsAMD, glDeletePerfMonitorsAMD, NULL, 1154),
+    NAME_FUNC_OFFSET(20733, glEndPerfMonitorAMD, glEndPerfMonitorAMD, NULL, 1155),
+    NAME_FUNC_OFFSET(20753, glGenPerfMonitorsAMD, glGenPerfMonitorsAMD, NULL, 1156),
+    NAME_FUNC_OFFSET(20774, glGetPerfMonitorCounterDataAMD, glGetPerfMonitorCounterDataAMD, NULL, 1157),
+    NAME_FUNC_OFFSET(20805, glGetPerfMonitorCounterInfoAMD, glGetPerfMonitorCounterInfoAMD, NULL, 1158),
+    NAME_FUNC_OFFSET(20836, glGetPerfMonitorCounterStringAMD, glGetPerfMonitorCounterStringAMD, NULL, 1159),
+    NAME_FUNC_OFFSET(20869, glGetPerfMonitorCountersAMD, glGetPerfMonitorCountersAMD, NULL, 1160),
+    NAME_FUNC_OFFSET(20897, glGetPerfMonitorGroupStringAMD, glGetPerfMonitorGroupStringAMD, NULL, 1161),
+    NAME_FUNC_OFFSET(20928, glGetPerfMonitorGroupsAMD, glGetPerfMonitorGroupsAMD, NULL, 1162),
+    NAME_FUNC_OFFSET(20954, glSelectPerfMonitorCountersAMD, glSelectPerfMonitorCountersAMD, NULL, 1163),
+    NAME_FUNC_OFFSET(20985, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 1164),
+    NAME_FUNC_OFFSET(21013, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 1165),
+    NAME_FUNC_OFFSET(21036, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 1166),
+    NAME_FUNC_OFFSET(21061, glActiveProgramEXT, glActiveProgramEXT, NULL, 1167),
+    NAME_FUNC_OFFSET(21080, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 1168),
+    NAME_FUNC_OFFSET(21105, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 1169),
+    NAME_FUNC_OFFSET(21127, glTextureBarrierNV, glTextureBarrierNV, NULL, 1170),
+    NAME_FUNC_OFFSET(21146, glVDPAUFiniNV, glVDPAUFiniNV, NULL, 1171),
+    NAME_FUNC_OFFSET(21160, glVDPAUGetSurfaceivNV, glVDPAUGetSurfaceivNV, NULL, 1172),
+    NAME_FUNC_OFFSET(21182, glVDPAUInitNV, glVDPAUInitNV, NULL, 1173),
+    NAME_FUNC_OFFSET(21196, glVDPAUIsSurfaceNV, glVDPAUIsSurfaceNV, NULL, 1174),
+    NAME_FUNC_OFFSET(21215, glVDPAUMapSurfacesNV, glVDPAUMapSurfacesNV, NULL, 1175),
+    NAME_FUNC_OFFSET(21236, glVDPAURegisterOutputSurfaceNV, glVDPAURegisterOutputSurfaceNV, NULL, 1176),
+    NAME_FUNC_OFFSET(21267, glVDPAURegisterVideoSurfaceNV, glVDPAURegisterVideoSurfaceNV, NULL, 1177),
+    NAME_FUNC_OFFSET(21297, glVDPAUSurfaceAccessNV, glVDPAUSurfaceAccessNV, NULL, 1178),
+    NAME_FUNC_OFFSET(21320, glVDPAUUnmapSurfacesNV, glVDPAUUnmapSurfacesNV, NULL, 1179),
+    NAME_FUNC_OFFSET(21343, glVDPAUUnregisterSurfaceNV, glVDPAUUnregisterSurfaceNV, NULL, 1180),
+    NAME_FUNC_OFFSET(21370, gl_dispatch_stub_1181, gl_dispatch_stub_1181, NULL, 1181),
+    NAME_FUNC_OFFSET(21392, gl_dispatch_stub_1182, gl_dispatch_stub_1182, NULL, 1182),
+    NAME_FUNC_OFFSET(21415, gl_dispatch_stub_1183, gl_dispatch_stub_1183, NULL, 1183),
+    NAME_FUNC_OFFSET(21438, gl_dispatch_stub_1184, gl_dispatch_stub_1184, NULL, 1184),
+    NAME_FUNC_OFFSET(21458, gl_dispatch_stub_1185, gl_dispatch_stub_1185, NULL, 1185),
+    NAME_FUNC_OFFSET(21485, gl_dispatch_stub_1186, gl_dispatch_stub_1186, NULL, 1186),
+    NAME_FUNC_OFFSET(21511, gl_dispatch_stub_1187, gl_dispatch_stub_1187, NULL, 1187),
+    NAME_FUNC_OFFSET(21537, gl_dispatch_stub_1188, gl_dispatch_stub_1188, NULL, 1188),
+    NAME_FUNC_OFFSET(21561, gl_dispatch_stub_1189, gl_dispatch_stub_1189, NULL, 1189),
+    NAME_FUNC_OFFSET(21589, gl_dispatch_stub_1190, gl_dispatch_stub_1190, NULL, 1190),
+    NAME_FUNC_OFFSET(21613, glPolygonOffsetClampEXT, glPolygonOffsetClampEXT, NULL, 1191),
+    NAME_FUNC_OFFSET(21637, gl_dispatch_stub_1192, gl_dispatch_stub_1192, NULL, 1192),
+    NAME_FUNC_OFFSET(21662, gl_dispatch_stub_1193, gl_dispatch_stub_1193, NULL, 1193),
+    NAME_FUNC_OFFSET(21691, gl_dispatch_stub_1194, gl_dispatch_stub_1194, NULL, 1194),
+    NAME_FUNC_OFFSET(21722, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 1195),
+    NAME_FUNC_OFFSET(21761, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 1196),
+    NAME_FUNC_OFFSET(21790, glAlphaFuncx, glAlphaFuncx, NULL, 1197),
+    NAME_FUNC_OFFSET(21803, glClearColorx, glClearColorx, NULL, 1198),
+    NAME_FUNC_OFFSET(21817, glClearDepthx, glClearDepthx, NULL, 1199),
+    NAME_FUNC_OFFSET(21831, glColor4x, glColor4x, NULL, 1200),
+    NAME_FUNC_OFFSET(21841, glDepthRangex, glDepthRangex, NULL, 1201),
+    NAME_FUNC_OFFSET(21855, glFogx, glFogx, NULL, 1202),
+    NAME_FUNC_OFFSET(21862, glFogxv, glFogxv, NULL, 1203),
+    NAME_FUNC_OFFSET(21870, glFrustumf, glFrustumf, NULL, 1204),
+    NAME_FUNC_OFFSET(21881, glFrustumx, glFrustumx, NULL, 1205),
+    NAME_FUNC_OFFSET(21892, glLightModelx, glLightModelx, NULL, 1206),
+    NAME_FUNC_OFFSET(21906, glLightModelxv, glLightModelxv, NULL, 1207),
+    NAME_FUNC_OFFSET(21921, glLightx, glLightx, NULL, 1208),
+    NAME_FUNC_OFFSET(21930, glLightxv, glLightxv, NULL, 1209),
+    NAME_FUNC_OFFSET(21940, glLineWidthx, glLineWidthx, NULL, 1210),
+    NAME_FUNC_OFFSET(21953, glLoadMatrixx, glLoadMatrixx, NULL, 1211),
+    NAME_FUNC_OFFSET(21967, glMaterialx, glMaterialx, NULL, 1212),
+    NAME_FUNC_OFFSET(21979, glMaterialxv, glMaterialxv, NULL, 1213),
+    NAME_FUNC_OFFSET(21992, glMultMatrixx, glMultMatrixx, NULL, 1214),
+    NAME_FUNC_OFFSET(22006, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1215),
+    NAME_FUNC_OFFSET(22024, glNormal3x, glNormal3x, NULL, 1216),
+    NAME_FUNC_OFFSET(22035, glOrthof, glOrthof, NULL, 1217),
+    NAME_FUNC_OFFSET(22044, glOrthox, glOrthox, NULL, 1218),
+    NAME_FUNC_OFFSET(22053, glPointSizex, glPointSizex, NULL, 1219),
+    NAME_FUNC_OFFSET(22066, glPolygonOffsetx, glPolygonOffsetx, NULL, 1220),
+    NAME_FUNC_OFFSET(22083, glRotatex, glRotatex, NULL, 1221),
+    NAME_FUNC_OFFSET(22093, glSampleCoveragex, glSampleCoveragex, NULL, 1222),
+    NAME_FUNC_OFFSET(22111, glScalex, glScalex, NULL, 1223),
+    NAME_FUNC_OFFSET(22120, glTexEnvx, glTexEnvx, NULL, 1224),
+    NAME_FUNC_OFFSET(22130, glTexEnvxv, glTexEnvxv, NULL, 1225),
+    NAME_FUNC_OFFSET(22141, glTexParameterx, glTexParameterx, NULL, 1226),
+    NAME_FUNC_OFFSET(22157, glTranslatex, glTranslatex, NULL, 1227),
+    NAME_FUNC_OFFSET(22170, glClipPlanef, glClipPlanef, NULL, 1228),
+    NAME_FUNC_OFFSET(22183, glClipPlanex, glClipPlanex, NULL, 1229),
+    NAME_FUNC_OFFSET(22196, glGetClipPlanef, glGetClipPlanef, NULL, 1230),
+    NAME_FUNC_OFFSET(22212, glGetClipPlanex, glGetClipPlanex, NULL, 1231),
+    NAME_FUNC_OFFSET(22228, glGetFixedv, glGetFixedv, NULL, 1232),
+    NAME_FUNC_OFFSET(22240, glGetLightxv, glGetLightxv, NULL, 1233),
+    NAME_FUNC_OFFSET(22253, glGetMaterialxv, glGetMaterialxv, NULL, 1234),
+    NAME_FUNC_OFFSET(22269, glGetTexEnvxv, glGetTexEnvxv, NULL, 1235),
+    NAME_FUNC_OFFSET(22283, glGetTexParameterxv, glGetTexParameterxv, NULL, 1236),
+    NAME_FUNC_OFFSET(22303, glPointParameterx, glPointParameterx, NULL, 1237),
+    NAME_FUNC_OFFSET(22321, glPointParameterxv, glPointParameterxv, NULL, 1238),
+    NAME_FUNC_OFFSET(22340, glTexParameterxv, glTexParameterxv, NULL, 1239),
+    NAME_FUNC_OFFSET(22357, glTexGenf, glTexGenf, NULL, 190),
+    NAME_FUNC_OFFSET(22370, glTexGenfv, glTexGenfv, NULL, 191),
+    NAME_FUNC_OFFSET(22384, glTexGeni, glTexGeni, NULL, 192),
+    NAME_FUNC_OFFSET(22397, glTexGeniv, glTexGeniv, NULL, 193),
+    NAME_FUNC_OFFSET(22411, glReadBuffer, glReadBuffer, NULL, 254),
+    NAME_FUNC_OFFSET(22426, glGetTexGenfv, glGetTexGenfv, NULL, 279),
+    NAME_FUNC_OFFSET(22443, glGetTexGeniv, glGetTexGeniv, NULL, 280),
+    NAME_FUNC_OFFSET(22460, glArrayElement, glArrayElement, NULL, 306),
+    NAME_FUNC_OFFSET(22478, glBindTexture, glBindTexture, NULL, 307),
+    NAME_FUNC_OFFSET(22495, glDrawArrays, glDrawArrays, NULL, 310),
+    NAME_FUNC_OFFSET(22511, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
+    NAME_FUNC_OFFSET(22536, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+    NAME_FUNC_OFFSET(22556, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+    NAME_FUNC_OFFSET(22576, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+    NAME_FUNC_OFFSET(22599, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+    NAME_FUNC_OFFSET(22622, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
+    NAME_FUNC_OFFSET(22642, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
+    NAME_FUNC_OFFSET(22659, glGetPointerv, glGetPointerv, NULL, 329),
+    NAME_FUNC_OFFSET(22676, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
+    NAME_FUNC_OFFSET(22691, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+    NAME_FUNC_OFFSET(22715, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+    NAME_FUNC_OFFSET(22734, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+    NAME_FUNC_OFFSET(22753, glBlendColor, glBlendColor, NULL, 336),
+    NAME_FUNC_OFFSET(22769, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(22788, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(22807, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+    NAME_FUNC_OFFSET(22830, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(22846, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(22862, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+    NAME_FUNC_OFFSET(22889, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+    NAME_FUNC_OFFSET(22916, glCopyColorTable, glCopyColorTable, NULL, 342),
+    NAME_FUNC_OFFSET(22936, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(22955, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(22974, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(23004, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(23034, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(23064, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(23094, glColorSubTable, glColorSubTable, NULL, 346),
+    NAME_FUNC_OFFSET(23113, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+    NAME_FUNC_OFFSET(23136, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+    NAME_FUNC_OFFSET(23161, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+    NAME_FUNC_OFFSET(23186, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+    NAME_FUNC_OFFSET(23213, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+    NAME_FUNC_OFFSET(23241, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+    NAME_FUNC_OFFSET(23268, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+    NAME_FUNC_OFFSET(23296, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+    NAME_FUNC_OFFSET(23325, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+    NAME_FUNC_OFFSET(23354, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
+    NAME_FUNC_OFFSET(23380, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
+    NAME_FUNC_OFFSET(23411, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
+    NAME_FUNC_OFFSET(23442, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
+    NAME_FUNC_OFFSET(23466, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+    NAME_FUNC_OFFSET(23489, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
+    NAME_FUNC_OFFSET(23507, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
+    NAME_FUNC_OFFSET(23536, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
+    NAME_FUNC_OFFSET(23565, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
+    NAME_FUNC_OFFSET(23580, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
+    NAME_FUNC_OFFSET(23606, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
+    NAME_FUNC_OFFSET(23632, glHistogram, glHistogram, NULL, 367),
+    NAME_FUNC_OFFSET(23647, glMinmax, glMinmax, NULL, 368),
+    NAME_FUNC_OFFSET(23659, glResetHistogram, glResetHistogram, NULL, 369),
+    NAME_FUNC_OFFSET(23679, glResetMinmax, glResetMinmax, NULL, 370),
+    NAME_FUNC_OFFSET(23696, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(23712, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(23728, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(23747, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(23766, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(23789, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(23812, glActiveTexture, glActiveTexture, NULL, 374),
+    NAME_FUNC_OFFSET(23831, glClientActiveTexture, glClientActiveTexture, NULL, 375),
+    NAME_FUNC_OFFSET(23856, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376),
+    NAME_FUNC_OFFSET(23877, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377),
+    NAME_FUNC_OFFSET(23899, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+    NAME_FUNC_OFFSET(23917, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+    NAME_FUNC_OFFSET(23936, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380),
+    NAME_FUNC_OFFSET(23957, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381),
+    NAME_FUNC_OFFSET(23979, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382),
+    NAME_FUNC_OFFSET(24000, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383),
+    NAME_FUNC_OFFSET(24022, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384),
+    NAME_FUNC_OFFSET(24043, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385),
+    NAME_FUNC_OFFSET(24065, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+    NAME_FUNC_OFFSET(24083, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+    NAME_FUNC_OFFSET(24102, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388),
+    NAME_FUNC_OFFSET(24123, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389),
+    NAME_FUNC_OFFSET(24145, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390),
+    NAME_FUNC_OFFSET(24166, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391),
+    NAME_FUNC_OFFSET(24188, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392),
+    NAME_FUNC_OFFSET(24209, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393),
+    NAME_FUNC_OFFSET(24231, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+    NAME_FUNC_OFFSET(24249, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+    NAME_FUNC_OFFSET(24268, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396),
+    NAME_FUNC_OFFSET(24289, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397),
+    NAME_FUNC_OFFSET(24311, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398),
+    NAME_FUNC_OFFSET(24332, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399),
+    NAME_FUNC_OFFSET(24354, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400),
+    NAME_FUNC_OFFSET(24375, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401),
+    NAME_FUNC_OFFSET(24397, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+    NAME_FUNC_OFFSET(24415, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+    NAME_FUNC_OFFSET(24434, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404),
+    NAME_FUNC_OFFSET(24455, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405),
+    NAME_FUNC_OFFSET(24477, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406),
+    NAME_FUNC_OFFSET(24498, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407),
+    NAME_FUNC_OFFSET(24520, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408),
+    NAME_FUNC_OFFSET(24546, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409),
+    NAME_FUNC_OFFSET(24572, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+    NAME_FUNC_OFFSET(24598, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+    NAME_FUNC_OFFSET(24624, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411),
+    NAME_FUNC_OFFSET(24653, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412),
+    NAME_FUNC_OFFSET(24682, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+    NAME_FUNC_OFFSET(24711, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+    NAME_FUNC_OFFSET(24740, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414),
+    NAME_FUNC_OFFSET(24767, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415),
+    NAME_FUNC_OFFSET(24793, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416),
+    NAME_FUNC_OFFSET(24819, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417),
+    NAME_FUNC_OFFSET(24845, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418),
+    NAME_FUNC_OFFSET(24871, glSampleCoverage, glSampleCoverage, NULL, 419),
+    NAME_FUNC_OFFSET(24891, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET(24914, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET(24938, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET(24961, glFogCoordPointer, glFogCoordPointer, NULL, 421),
+    NAME_FUNC_OFFSET(24982, glFogCoordd, glFogCoordd, NULL, 422),
+    NAME_FUNC_OFFSET(24997, glFogCoorddv, glFogCoorddv, NULL, 423),
+    NAME_FUNC_OFFSET(25013, glMultiDrawArrays, glMultiDrawArrays, NULL, 424),
+    NAME_FUNC_OFFSET(25034, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET(25055, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET(25076, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET(25098, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET(25120, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET(25142, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET(25165, glPointParameteri, glPointParameteri, NULL, 427),
+    NAME_FUNC_OFFSET(25185, glPointParameteriv, glPointParameteriv, NULL, 428),
+    NAME_FUNC_OFFSET(25206, glSecondaryColor3b, glSecondaryColor3b, NULL, 429),
+    NAME_FUNC_OFFSET(25228, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430),
+    NAME_FUNC_OFFSET(25251, glSecondaryColor3d, glSecondaryColor3d, NULL, 431),
+    NAME_FUNC_OFFSET(25273, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432),
+    NAME_FUNC_OFFSET(25296, glSecondaryColor3i, glSecondaryColor3i, NULL, 433),
+    NAME_FUNC_OFFSET(25318, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434),
+    NAME_FUNC_OFFSET(25341, glSecondaryColor3s, glSecondaryColor3s, NULL, 435),
+    NAME_FUNC_OFFSET(25363, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436),
+    NAME_FUNC_OFFSET(25386, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437),
+    NAME_FUNC_OFFSET(25409, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438),
+    NAME_FUNC_OFFSET(25433, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439),
+    NAME_FUNC_OFFSET(25456, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440),
+    NAME_FUNC_OFFSET(25480, glSecondaryColor3us, glSecondaryColor3us, NULL, 441),
+    NAME_FUNC_OFFSET(25503, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442),
+    NAME_FUNC_OFFSET(25527, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443),
+    NAME_FUNC_OFFSET(25554, glWindowPos2d, glWindowPos2d, NULL, 444),
+    NAME_FUNC_OFFSET(25571, glWindowPos2d, glWindowPos2d, NULL, 444),
+    NAME_FUNC_OFFSET(25589, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+    NAME_FUNC_OFFSET(25607, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+    NAME_FUNC_OFFSET(25626, glWindowPos2f, glWindowPos2f, NULL, 446),
+    NAME_FUNC_OFFSET(25643, glWindowPos2f, glWindowPos2f, NULL, 446),
+    NAME_FUNC_OFFSET(25661, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+    NAME_FUNC_OFFSET(25679, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+    NAME_FUNC_OFFSET(25698, glWindowPos2i, glWindowPos2i, NULL, 448),
+    NAME_FUNC_OFFSET(25715, glWindowPos2i, glWindowPos2i, NULL, 448),
+    NAME_FUNC_OFFSET(25733, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+    NAME_FUNC_OFFSET(25751, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+    NAME_FUNC_OFFSET(25770, glWindowPos2s, glWindowPos2s, NULL, 450),
+    NAME_FUNC_OFFSET(25787, glWindowPos2s, glWindowPos2s, NULL, 450),
+    NAME_FUNC_OFFSET(25805, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+    NAME_FUNC_OFFSET(25823, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+    NAME_FUNC_OFFSET(25842, glWindowPos3d, glWindowPos3d, NULL, 452),
+    NAME_FUNC_OFFSET(25859, glWindowPos3d, glWindowPos3d, NULL, 452),
+    NAME_FUNC_OFFSET(25877, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+    NAME_FUNC_OFFSET(25895, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+    NAME_FUNC_OFFSET(25914, glWindowPos3f, glWindowPos3f, NULL, 454),
+    NAME_FUNC_OFFSET(25931, glWindowPos3f, glWindowPos3f, NULL, 454),
+    NAME_FUNC_OFFSET(25949, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+    NAME_FUNC_OFFSET(25967, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+    NAME_FUNC_OFFSET(25986, glWindowPos3i, glWindowPos3i, NULL, 456),
+    NAME_FUNC_OFFSET(26003, glWindowPos3i, glWindowPos3i, NULL, 456),
+    NAME_FUNC_OFFSET(26021, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+    NAME_FUNC_OFFSET(26039, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+    NAME_FUNC_OFFSET(26058, glWindowPos3s, glWindowPos3s, NULL, 458),
+    NAME_FUNC_OFFSET(26075, glWindowPos3s, glWindowPos3s, NULL, 458),
+    NAME_FUNC_OFFSET(26093, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+    NAME_FUNC_OFFSET(26111, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+    NAME_FUNC_OFFSET(26130, glBeginQuery, glBeginQuery, NULL, 460),
+    NAME_FUNC_OFFSET(26146, glBindBuffer, glBindBuffer, NULL, 461),
+    NAME_FUNC_OFFSET(26162, glBufferData, glBufferData, NULL, 462),
+    NAME_FUNC_OFFSET(26178, glBufferSubData, glBufferSubData, NULL, 463),
+    NAME_FUNC_OFFSET(26197, glDeleteBuffers, glDeleteBuffers, NULL, 464),
+    NAME_FUNC_OFFSET(26216, glDeleteQueries, glDeleteQueries, NULL, 465),
+    NAME_FUNC_OFFSET(26235, glEndQuery, glEndQuery, NULL, 466),
+    NAME_FUNC_OFFSET(26249, glGenBuffers, glGenBuffers, NULL, 467),
+    NAME_FUNC_OFFSET(26265, glGenQueries, glGenQueries, NULL, 468),
+    NAME_FUNC_OFFSET(26281, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469),
+    NAME_FUNC_OFFSET(26307, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+    NAME_FUNC_OFFSET(26330, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+    NAME_FUNC_OFFSET(26353, glGetBufferSubData, glGetBufferSubData, NULL, 471),
+    NAME_FUNC_OFFSET(26375, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472),
+    NAME_FUNC_OFFSET(26397, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473),
+    NAME_FUNC_OFFSET(26420, glGetQueryiv, glGetQueryiv, NULL, 474),
+    NAME_FUNC_OFFSET(26436, glIsBuffer, glIsBuffer, NULL, 475),
+    NAME_FUNC_OFFSET(26450, glIsQuery, glIsQuery, NULL, 476),
+    NAME_FUNC_OFFSET(26463, glMapBuffer, glMapBuffer, NULL, 477),
+    NAME_FUNC_OFFSET(26478, glMapBuffer, glMapBuffer, NULL, 477),
+    NAME_FUNC_OFFSET(26493, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+    NAME_FUNC_OFFSET(26510, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+    NAME_FUNC_OFFSET(26527, glBindAttribLocation, glBindAttribLocation, NULL, 480),
+    NAME_FUNC_OFFSET(26551, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET(26578, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET(26605, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET(26632, glCompileShader, glCompileShader, NULL, 482),
+    NAME_FUNC_OFFSET(26651, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488),
+    NAME_FUNC_OFFSET(26681, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(26698, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(26715, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(26731, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(26748, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490),
+    NAME_FUNC_OFFSET(26777, glGetActiveAttrib, glGetActiveAttrib, NULL, 491),
+    NAME_FUNC_OFFSET(26798, glGetActiveUniform, glGetActiveUniform, NULL, 492),
+    NAME_FUNC_OFFSET(26820, glGetAttribLocation, glGetAttribLocation, NULL, 494),
+    NAME_FUNC_OFFSET(26843, glGetShaderSource, glGetShaderSource, NULL, 498),
+    NAME_FUNC_OFFSET(26864, glGetUniformLocation, glGetUniformLocation, NULL, 500),
+    NAME_FUNC_OFFSET(26888, glGetUniformfv, glGetUniformfv, NULL, 501),
+    NAME_FUNC_OFFSET(26906, glGetUniformiv, glGetUniformiv, NULL, 502),
+    NAME_FUNC_OFFSET(26924, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+    NAME_FUNC_OFFSET(26953, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+    NAME_FUNC_OFFSET(26981, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504),
+    NAME_FUNC_OFFSET(27004, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505),
+    NAME_FUNC_OFFSET(27027, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506),
+    NAME_FUNC_OFFSET(27050, glLinkProgram, glLinkProgram, NULL, 509),
+    NAME_FUNC_OFFSET(27067, glShaderSource, glShaderSource, NULL, 510),
+    NAME_FUNC_OFFSET(27085, glStencilOpSeparate, glStencilOpSeparate, NULL, 513),
+    NAME_FUNC_OFFSET(27108, glUniform1f, glUniform1f, NULL, 514),
+    NAME_FUNC_OFFSET(27123, glUniform1fv, glUniform1fv, NULL, 515),
+    NAME_FUNC_OFFSET(27139, glUniform1i, glUniform1i, NULL, 516),
+    NAME_FUNC_OFFSET(27154, glUniform1iv, glUniform1iv, NULL, 517),
+    NAME_FUNC_OFFSET(27170, glUniform2f, glUniform2f, NULL, 518),
+    NAME_FUNC_OFFSET(27185, glUniform2fv, glUniform2fv, NULL, 519),
+    NAME_FUNC_OFFSET(27201, glUniform2i, glUniform2i, NULL, 520),
+    NAME_FUNC_OFFSET(27216, glUniform2iv, glUniform2iv, NULL, 521),
+    NAME_FUNC_OFFSET(27232, glUniform3f, glUniform3f, NULL, 522),
+    NAME_FUNC_OFFSET(27247, glUniform3fv, glUniform3fv, NULL, 523),
+    NAME_FUNC_OFFSET(27263, glUniform3i, glUniform3i, NULL, 524),
+    NAME_FUNC_OFFSET(27278, glUniform3iv, glUniform3iv, NULL, 525),
+    NAME_FUNC_OFFSET(27294, glUniform4f, glUniform4f, NULL, 526),
+    NAME_FUNC_OFFSET(27309, glUniform4fv, glUniform4fv, NULL, 527),
+    NAME_FUNC_OFFSET(27325, glUniform4i, glUniform4i, NULL, 528),
+    NAME_FUNC_OFFSET(27340, glUniform4iv, glUniform4iv, NULL, 529),
+    NAME_FUNC_OFFSET(27356, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530),
+    NAME_FUNC_OFFSET(27378, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531),
+    NAME_FUNC_OFFSET(27400, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532),
+    NAME_FUNC_OFFSET(27422, glUseProgram, glUseProgram, NULL, 533),
+    NAME_FUNC_OFFSET(27444, glValidateProgram, glValidateProgram, NULL, 534),
+    NAME_FUNC_OFFSET(27465, glVertexAttrib1d, glVertexAttrib1d, NULL, 535),
+    NAME_FUNC_OFFSET(27485, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536),
+    NAME_FUNC_OFFSET(27506, glVertexAttrib1s, glVertexAttrib1s, NULL, 537),
+    NAME_FUNC_OFFSET(27526, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538),
+    NAME_FUNC_OFFSET(27547, glVertexAttrib2d, glVertexAttrib2d, NULL, 539),
+    NAME_FUNC_OFFSET(27567, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540),
+    NAME_FUNC_OFFSET(27588, glVertexAttrib2s, glVertexAttrib2s, NULL, 541),
+    NAME_FUNC_OFFSET(27608, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542),
+    NAME_FUNC_OFFSET(27629, glVertexAttrib3d, glVertexAttrib3d, NULL, 543),
+    NAME_FUNC_OFFSET(27649, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544),
+    NAME_FUNC_OFFSET(27670, glVertexAttrib3s, glVertexAttrib3s, NULL, 545),
+    NAME_FUNC_OFFSET(27690, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546),
+    NAME_FUNC_OFFSET(27711, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547),
+    NAME_FUNC_OFFSET(27733, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548),
+    NAME_FUNC_OFFSET(27755, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549),
+    NAME_FUNC_OFFSET(27777, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550),
+    NAME_FUNC_OFFSET(27799, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551),
+    NAME_FUNC_OFFSET(27822, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552),
+    NAME_FUNC_OFFSET(27845, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553),
+    NAME_FUNC_OFFSET(27868, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554),
+    NAME_FUNC_OFFSET(27889, glVertexAttrib4d, glVertexAttrib4d, NULL, 555),
+    NAME_FUNC_OFFSET(27909, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556),
+    NAME_FUNC_OFFSET(27930, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557),
+    NAME_FUNC_OFFSET(27951, glVertexAttrib4s, glVertexAttrib4s, NULL, 558),
+    NAME_FUNC_OFFSET(27971, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559),
+    NAME_FUNC_OFFSET(27992, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560),
+    NAME_FUNC_OFFSET(28014, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561),
+    NAME_FUNC_OFFSET(28036, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562),
+    NAME_FUNC_OFFSET(28058, glVertexAttribPointer, glVertexAttribPointer, NULL, 563),
+    NAME_FUNC_OFFSET(28083, glBeginConditionalRender, glBeginConditionalRender, NULL, 570),
+    NAME_FUNC_OFFSET(28110, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571),
+    NAME_FUNC_OFFSET(28138, glBindBufferBase, glBindBufferBase, NULL, 572),
+    NAME_FUNC_OFFSET(28158, glBindBufferRange, glBindBufferRange, NULL, 573),
+    NAME_FUNC_OFFSET(28179, glBindFragDataLocation, glBindFragDataLocation, NULL, 574),
+    NAME_FUNC_OFFSET(28205, glClampColor, glClampColor, NULL, 575),
+    NAME_FUNC_OFFSET(28221, glColorMaski, glColorMaski, NULL, 580),
+    NAME_FUNC_OFFSET(28243, glDisablei, glDisablei, NULL, 581),
+    NAME_FUNC_OFFSET(28263, glEnablei, glEnablei, NULL, 582),
+    NAME_FUNC_OFFSET(28282, glEndConditionalRender, glEndConditionalRender, NULL, 583),
+    NAME_FUNC_OFFSET(28307, glEndTransformFeedback, glEndTransformFeedback, NULL, 584),
+    NAME_FUNC_OFFSET(28333, glGetBooleani_v, glGetBooleani_v, NULL, 585),
+    NAME_FUNC_OFFSET(28357, glGetFragDataLocation, glGetFragDataLocation, NULL, 586),
+    NAME_FUNC_OFFSET(28382, glGetIntegeri_v, glGetIntegeri_v, NULL, 587),
+    NAME_FUNC_OFFSET(28406, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589),
+    NAME_FUNC_OFFSET(28430, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590),
+    NAME_FUNC_OFFSET(28455, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591),
+    NAME_FUNC_OFFSET(28488, glGetUniformuiv, glGetUniformuiv, NULL, 592),
+    NAME_FUNC_OFFSET(28507, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593),
+    NAME_FUNC_OFFSET(28531, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594),
+    NAME_FUNC_OFFSET(28556, glIsEnabledi, glIsEnabledi, NULL, 595),
+    NAME_FUNC_OFFSET(28578, glTexParameterIiv, glTexParameterIiv, NULL, 596),
+    NAME_FUNC_OFFSET(28599, glTexParameterIuiv, glTexParameterIuiv, NULL, 597),
+    NAME_FUNC_OFFSET(28621, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598),
+    NAME_FUNC_OFFSET(28652, glUniform1ui, glUniform1ui, NULL, 599),
+    NAME_FUNC_OFFSET(28668, glUniform1uiv, glUniform1uiv, NULL, 600),
+    NAME_FUNC_OFFSET(28685, glUniform2ui, glUniform2ui, NULL, 601),
+    NAME_FUNC_OFFSET(28701, glUniform2uiv, glUniform2uiv, NULL, 602),
+    NAME_FUNC_OFFSET(28718, glUniform3ui, glUniform3ui, NULL, 603),
+    NAME_FUNC_OFFSET(28734, glUniform3uiv, glUniform3uiv, NULL, 604),
+    NAME_FUNC_OFFSET(28751, glUniform4ui, glUniform4ui, NULL, 605),
+    NAME_FUNC_OFFSET(28767, glUniform4uiv, glUniform4uiv, NULL, 606),
+    NAME_FUNC_OFFSET(28784, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607),
+    NAME_FUNC_OFFSET(28806, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608),
+    NAME_FUNC_OFFSET(28829, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609),
+    NAME_FUNC_OFFSET(28851, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610),
+    NAME_FUNC_OFFSET(28873, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611),
+    NAME_FUNC_OFFSET(28896, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612),
+    NAME_FUNC_OFFSET(28919, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613),
+    NAME_FUNC_OFFSET(28945, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614),
+    NAME_FUNC_OFFSET(28971, glTexBuffer, glTexBuffer, NULL, 615),
+    NAME_FUNC_OFFSET(28986, glFramebufferTexture, glFramebufferTexture, NULL, 616),
+    NAME_FUNC_OFFSET(29010, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619),
+    NAME_FUNC_OFFSET(29035, glMinSampleShading, glMinSampleShading, NULL, 620),
+    NAME_FUNC_OFFSET(29057, glBindProgramARB, glBindProgramARB, NULL, 621),
+    NAME_FUNC_OFFSET(29073, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 622),
+    NAME_FUNC_OFFSET(29092, glGenProgramsARB, glGenProgramsARB, NULL, 623),
+    NAME_FUNC_OFFSET(29108, glIsProgramARB, glIsProgramARB, NULL, 630),
+    NAME_FUNC_OFFSET(29122, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 631),
+    NAME_FUNC_OFFSET(29145, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 632),
+    NAME_FUNC_OFFSET(29169, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 633),
+    NAME_FUNC_OFFSET(29192, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 634),
+    NAME_FUNC_OFFSET(29216, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 640),
+    NAME_FUNC_OFFSET(29233, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 641),
+    NAME_FUNC_OFFSET(29251, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 642),
+    NAME_FUNC_OFFSET(29268, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 643),
+    NAME_FUNC_OFFSET(29286, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 644),
+    NAME_FUNC_OFFSET(29303, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 645),
+    NAME_FUNC_OFFSET(29321, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 646),
+    NAME_FUNC_OFFSET(29338, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 647),
+    NAME_FUNC_OFFSET(29356, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
+    NAME_FUNC_OFFSET(29381, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
+    NAME_FUNC_OFFSET(29403, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
+    NAME_FUNC_OFFSET(29430, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
+    NAME_FUNC_OFFSET(29454, glBindFramebuffer, glBindFramebuffer, NULL, 660),
+    NAME_FUNC_OFFSET(29475, glBindRenderbuffer, glBindRenderbuffer, NULL, 661),
+    NAME_FUNC_OFFSET(29497, glBlitFramebuffer, glBlitFramebuffer, NULL, 662),
+    NAME_FUNC_OFFSET(29518, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
+    NAME_FUNC_OFFSET(29546, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
+    NAME_FUNC_OFFSET(29574, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
+    NAME_FUNC_OFFSET(29598, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
+    NAME_FUNC_OFFSET(29622, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
+    NAME_FUNC_OFFSET(29647, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
+    NAME_FUNC_OFFSET(29672, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
+    NAME_FUNC_OFFSET(29701, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
+    NAME_FUNC_OFFSET(29730, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 667),
+    NAME_FUNC_OFFSET(29756, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
+    NAME_FUNC_OFFSET(29782, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
+    NAME_FUNC_OFFSET(29808, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
+    NAME_FUNC_OFFSET(29834, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
+    NAME_FUNC_OFFSET(29860, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
+    NAME_FUNC_OFFSET(29889, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
+    NAME_FUNC_OFFSET(29918, glGenFramebuffers, glGenFramebuffers, NULL, 671),
+    NAME_FUNC_OFFSET(29939, glGenFramebuffers, glGenFramebuffers, NULL, 671),
+    NAME_FUNC_OFFSET(29960, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
+    NAME_FUNC_OFFSET(29982, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
+    NAME_FUNC_OFFSET(30004, glGenerateMipmap, glGenerateMipmap, NULL, 673),
+    NAME_FUNC_OFFSET(30024, glGenerateMipmap, glGenerateMipmap, NULL, 673),
+    NAME_FUNC_OFFSET(30044, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
+    NAME_FUNC_OFFSET(30085, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
+    NAME_FUNC_OFFSET(30126, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
+    NAME_FUNC_OFFSET(30158, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
+    NAME_FUNC_OFFSET(30190, glIsFramebuffer, glIsFramebuffer, NULL, 676),
+    NAME_FUNC_OFFSET(30209, glIsFramebuffer, glIsFramebuffer, NULL, 676),
+    NAME_FUNC_OFFSET(30228, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
+    NAME_FUNC_OFFSET(30248, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
+    NAME_FUNC_OFFSET(30268, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
+    NAME_FUNC_OFFSET(30293, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
+    NAME_FUNC_OFFSET(30318, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 679),
+    NAME_FUNC_OFFSET(30354, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 681),
+    NAME_FUNC_OFFSET(30382, glMapBufferRange, glMapBufferRange, NULL, 682),
+    NAME_FUNC_OFFSET(30402, glBindVertexArray, glBindVertexArray, NULL, 683),
+    NAME_FUNC_OFFSET(30423, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
+    NAME_FUNC_OFFSET(30449, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
+    NAME_FUNC_OFFSET(30473, glGenVertexArrays, glGenVertexArrays, NULL, 685),
+    NAME_FUNC_OFFSET(30494, glIsVertexArray, glIsVertexArray, NULL, 686),
+    NAME_FUNC_OFFSET(30515, glIsVertexArray, glIsVertexArray, NULL, 686),
+    NAME_FUNC_OFFSET(30534, glProvokingVertex, glProvokingVertex, NULL, 706),
+    NAME_FUNC_OFFSET(30555, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
+    NAME_FUNC_OFFSET(30589, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
+    NAME_FUNC_OFFSET(30614, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
+    NAME_FUNC_OFFSET(30640, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
+    NAME_FUNC_OFFSET(30657, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
+    NAME_FUNC_OFFSET(30687, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
+    NAME_FUNC_OFFSET(30708, glBlendFunciARB, glBlendFunciARB, NULL, 714),
+    NAME_FUNC_OFFSET(30730, glBlendFunciARB, glBlendFunciARB, NULL, 714),
+    NAME_FUNC_OFFSET(30743, gl_dispatch_stub_731, gl_dispatch_stub_731, NULL, 731),
+    NAME_FUNC_OFFSET(30767, gl_dispatch_stub_732, gl_dispatch_stub_732, NULL, 732),
+    NAME_FUNC_OFFSET(30792, glClearDepthf, glClearDepthf, NULL, 803),
+    NAME_FUNC_OFFSET(30809, glDepthRangef, glDepthRangef, NULL, 804),
+    NAME_FUNC_OFFSET(30826, glGetProgramBinary, glGetProgramBinary, NULL, 808),
+    NAME_FUNC_OFFSET(30848, glProgramBinary, glProgramBinary, NULL, 809),
+    NAME_FUNC_OFFSET(30867, glProgramParameteri, glProgramParameteri, NULL, 810),
+    NAME_FUNC_OFFSET(30890, glProgramParameteri, glProgramParameteri, NULL, 810),
+    NAME_FUNC_OFFSET(30913, gl_dispatch_stub_948, gl_dispatch_stub_948, NULL, 948),
+    NAME_FUNC_OFFSET(30929, gl_dispatch_stub_949, gl_dispatch_stub_949, NULL, 949),
+    NAME_FUNC_OFFSET(30948, gl_dispatch_stub_957, gl_dispatch_stub_957, NULL, 957),
+    NAME_FUNC_OFFSET(30973, gl_dispatch_stub_958, gl_dispatch_stub_958, NULL, 958),
+    NAME_FUNC_OFFSET(30998, gl_dispatch_stub_959, gl_dispatch_stub_959, NULL, 959),
+    NAME_FUNC_OFFSET(31024, gl_dispatch_stub_960, gl_dispatch_stub_960, NULL, 960),
+    NAME_FUNC_OFFSET(31052, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
+    NAME_FUNC_OFFSET(31077, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
+    NAME_FUNC_OFFSET(31108, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
+    NAME_FUNC_OFFSET(31134, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
+    NAME_FUNC_OFFSET(31157, gl_dispatch_stub_968, gl_dispatch_stub_968, NULL, 968),
+    NAME_FUNC_OFFSET(31179, gl_dispatch_stub_969, gl_dispatch_stub_969, NULL, 969),
+    NAME_FUNC_OFFSET(31202, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL, 970),
+    NAME_FUNC_OFFSET(31224, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
+    NAME_FUNC_OFFSET(31247, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
+    NAME_FUNC_OFFSET(31270, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
+    NAME_FUNC_OFFSET(31294, gl_dispatch_stub_976, gl_dispatch_stub_976, NULL, 976),
+    NAME_FUNC_OFFSET(31316, gl_dispatch_stub_977, gl_dispatch_stub_977, NULL, 977),
+    NAME_FUNC_OFFSET(31339, gl_dispatch_stub_978, gl_dispatch_stub_978, NULL, 978),
+    NAME_FUNC_OFFSET(31361, gl_dispatch_stub_979, gl_dispatch_stub_979, NULL, 979),
+    NAME_FUNC_OFFSET(31384, gl_dispatch_stub_980, gl_dispatch_stub_980, NULL, 980),
+    NAME_FUNC_OFFSET(31407, gl_dispatch_stub_981, gl_dispatch_stub_981, NULL, 981),
+    NAME_FUNC_OFFSET(31431, gl_dispatch_stub_984, gl_dispatch_stub_984, NULL, 984),
+    NAME_FUNC_OFFSET(31453, gl_dispatch_stub_985, gl_dispatch_stub_985, NULL, 985),
+    NAME_FUNC_OFFSET(31476, gl_dispatch_stub_986, gl_dispatch_stub_986, NULL, 986),
+    NAME_FUNC_OFFSET(31498, gl_dispatch_stub_987, gl_dispatch_stub_987, NULL, 987),
+    NAME_FUNC_OFFSET(31521, gl_dispatch_stub_988, gl_dispatch_stub_988, NULL, 988),
+    NAME_FUNC_OFFSET(31544, gl_dispatch_stub_989, gl_dispatch_stub_989, NULL, 989),
+    NAME_FUNC_OFFSET(31568, gl_dispatch_stub_992, gl_dispatch_stub_992, NULL, 992),
+    NAME_FUNC_OFFSET(31590, gl_dispatch_stub_993, gl_dispatch_stub_993, NULL, 993),
+    NAME_FUNC_OFFSET(31613, gl_dispatch_stub_994, gl_dispatch_stub_994, NULL, 994),
+    NAME_FUNC_OFFSET(31635, gl_dispatch_stub_995, gl_dispatch_stub_995, NULL, 995),
+    NAME_FUNC_OFFSET(31658, gl_dispatch_stub_996, gl_dispatch_stub_996, NULL, 996),
+    NAME_FUNC_OFFSET(31681, gl_dispatch_stub_997, gl_dispatch_stub_997, NULL, 997),
+    NAME_FUNC_OFFSET(31705, gl_dispatch_stub_999, gl_dispatch_stub_999, NULL, 999),
+    NAME_FUNC_OFFSET(31734, gl_dispatch_stub_1001, gl_dispatch_stub_1001, NULL, 1001),
+    NAME_FUNC_OFFSET(31765, gl_dispatch_stub_1003, gl_dispatch_stub_1003, NULL, 1003),
+    NAME_FUNC_OFFSET(31796, gl_dispatch_stub_1005, gl_dispatch_stub_1005, NULL, 1005),
+    NAME_FUNC_OFFSET(31825, gl_dispatch_stub_1007, gl_dispatch_stub_1007, NULL, 1007),
+    NAME_FUNC_OFFSET(31856, gl_dispatch_stub_1009, gl_dispatch_stub_1009, NULL, 1009),
+    NAME_FUNC_OFFSET(31887, gl_dispatch_stub_1011, gl_dispatch_stub_1011, NULL, 1011),
+    NAME_FUNC_OFFSET(31916, gl_dispatch_stub_1013, gl_dispatch_stub_1013, NULL, 1013),
+    NAME_FUNC_OFFSET(31947, gl_dispatch_stub_1015, gl_dispatch_stub_1015, NULL, 1015),
+    NAME_FUNC_OFFSET(31978, gl_dispatch_stub_1017, gl_dispatch_stub_1017, NULL, 1017),
+    NAME_FUNC_OFFSET(32000, gl_dispatch_stub_1018, gl_dispatch_stub_1018, NULL, 1018),
+    NAME_FUNC_OFFSET(32029, glDebugMessageCallback, glDebugMessageCallback, NULL, 1019),
+    NAME_FUNC_OFFSET(32055, glDebugMessageControl, glDebugMessageControl, NULL, 1020),
+    NAME_FUNC_OFFSET(32080, glDebugMessageInsert, glDebugMessageInsert, NULL, 1021),
+    NAME_FUNC_OFFSET(32104, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 1022),
+    NAME_FUNC_OFFSET(32128, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 1029),
+    NAME_FUNC_OFFSET(32147, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 1030),
+    NAME_FUNC_OFFSET(32167, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 1031),
+    NAME_FUNC_OFFSET(32187, glFogCoordfEXT, glFogCoordfEXT, NULL, 1032),
+    NAME_FUNC_OFFSET(32199, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 1033),
+    NAME_FUNC_OFFSET(32212, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1136),
+    NAME_FUNC_OFFSET(32230, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1137),
+    NAME_FUNC_OFFSET(32249, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1138),
+    NAME_FUNC_OFFSET(32267, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1139),
+    NAME_FUNC_OFFSET(32286, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1140),
+    NAME_FUNC_OFFSET(32305, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1141),
+    NAME_FUNC_OFFSET(32325, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1142),
+    NAME_FUNC_OFFSET(32343, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1143),
+    NAME_FUNC_OFFSET(32362, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1144),
+    NAME_FUNC_OFFSET(32381, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1145),
+    NAME_FUNC_OFFSET(32401, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1146),
+    NAME_FUNC_OFFSET(32419, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1147),
+    NAME_FUNC_OFFSET(32438, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1148),
+    NAME_FUNC_OFFSET(32457, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1149),
+    NAME_FUNC_OFFSET(32477, glTextureBarrierNV, glTextureBarrierNV, NULL, 1170),
+    NAME_FUNC_OFFSET(32494, glAlphaFuncx, glAlphaFuncx, NULL, 1197),
+    NAME_FUNC_OFFSET(32510, glClearColorx, glClearColorx, NULL, 1198),
+    NAME_FUNC_OFFSET(32527, glClearDepthx, glClearDepthx, NULL, 1199),
+    NAME_FUNC_OFFSET(32544, glColor4x, glColor4x, NULL, 1200),
+    NAME_FUNC_OFFSET(32557, glDepthRangex, glDepthRangex, NULL, 1201),
+    NAME_FUNC_OFFSET(32574, glFogx, glFogx, NULL, 1202),
+    NAME_FUNC_OFFSET(32584, glFogxv, glFogxv, NULL, 1203),
+    NAME_FUNC_OFFSET(32595, glFrustumf, glFrustumf, NULL, 1204),
+    NAME_FUNC_OFFSET(32609, glFrustumx, glFrustumx, NULL, 1205),
+    NAME_FUNC_OFFSET(32623, glLightModelx, glLightModelx, NULL, 1206),
+    NAME_FUNC_OFFSET(32640, glLightModelxv, glLightModelxv, NULL, 1207),
+    NAME_FUNC_OFFSET(32658, glLightx, glLightx, NULL, 1208),
+    NAME_FUNC_OFFSET(32670, glLightxv, glLightxv, NULL, 1209),
+    NAME_FUNC_OFFSET(32683, glLineWidthx, glLineWidthx, NULL, 1210),
+    NAME_FUNC_OFFSET(32699, glLoadMatrixx, glLoadMatrixx, NULL, 1211),
+    NAME_FUNC_OFFSET(32716, glMaterialx, glMaterialx, NULL, 1212),
+    NAME_FUNC_OFFSET(32731, glMaterialxv, glMaterialxv, NULL, 1213),
+    NAME_FUNC_OFFSET(32747, glMultMatrixx, glMultMatrixx, NULL, 1214),
+    NAME_FUNC_OFFSET(32764, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1215),
+    NAME_FUNC_OFFSET(32785, glNormal3x, glNormal3x, NULL, 1216),
+    NAME_FUNC_OFFSET(32799, glOrthof, glOrthof, NULL, 1217),
+    NAME_FUNC_OFFSET(32811, glOrthox, glOrthox, NULL, 1218),
+    NAME_FUNC_OFFSET(32823, glPointSizex, glPointSizex, NULL, 1219),
+    NAME_FUNC_OFFSET(32839, glPolygonOffsetx, glPolygonOffsetx, NULL, 1220),
+    NAME_FUNC_OFFSET(32859, glRotatex, glRotatex, NULL, 1221),
+    NAME_FUNC_OFFSET(32872, glSampleCoveragex, glSampleCoveragex, NULL, 1222),
+    NAME_FUNC_OFFSET(32893, glScalex, glScalex, NULL, 1223),
+    NAME_FUNC_OFFSET(32905, glTexEnvx, glTexEnvx, NULL, 1224),
+    NAME_FUNC_OFFSET(32918, glTexEnvxv, glTexEnvxv, NULL, 1225),
+    NAME_FUNC_OFFSET(32932, glTexParameterx, glTexParameterx, NULL, 1226),
+    NAME_FUNC_OFFSET(32951, glTranslatex, glTranslatex, NULL, 1227),
+    NAME_FUNC_OFFSET(32967, glClipPlanef, glClipPlanef, NULL, 1228),
+    NAME_FUNC_OFFSET(32983, glClipPlanex, glClipPlanex, NULL, 1229),
+    NAME_FUNC_OFFSET(32999, glGetClipPlanef, glGetClipPlanef, NULL, 1230),
+    NAME_FUNC_OFFSET(33018, glGetClipPlanex, glGetClipPlanex, NULL, 1231),
+    NAME_FUNC_OFFSET(33037, glGetFixedv, glGetFixedv, NULL, 1232),
+    NAME_FUNC_OFFSET(33052, glGetLightxv, glGetLightxv, NULL, 1233),
+    NAME_FUNC_OFFSET(33068, glGetMaterialxv, glGetMaterialxv, NULL, 1234),
+    NAME_FUNC_OFFSET(33087, glGetTexEnvxv, glGetTexEnvxv, NULL, 1235),
+    NAME_FUNC_OFFSET(33104, glGetTexParameterxv, glGetTexParameterxv, NULL, 1236),
+    NAME_FUNC_OFFSET(33127, glPointParameterx, glPointParameterx, NULL, 1237),
+    NAME_FUNC_OFFSET(33148, glPointParameterxv, glPointParameterxv, NULL, 1238),
+    NAME_FUNC_OFFSET(33170, glTexParameterxv, glTexParameterxv, NULL, 1239),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/xorg-server/glx/makefile b/xorg-server/glx/makefile
index 345734ecf..d749df94f 100644
--- a/xorg-server/glx/makefile
+++ b/xorg-server/glx/makefile
@@ -41,5 +41,5 @@ CSRCS = \
         swap_interval.c \
         xfont.c
 
-INCLUDES := $(MHMAKECONF)\mesalib\include $(INCLUDES)
+INCLUDES := $(MHMAKECONF)\mesalib\include . $(INCLUDES)
 
diff --git a/xorg-server/glx/remap_helper.h b/xorg-server/glx/remap_helper.h
index 3d005170d..d13667621 100644
--- a/xorg-server/glx/remap_helper.h
+++ b/xorg-server/glx/remap_helper.h
@@ -432,2686 +432,2738 @@ static const char _mesa_function_pool[] =
    "iiip\0"
    "glGetnCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[2902]: BindSampler (will be remapped) */
+   /* _mesa_function_pool[2902]: CopyNamedBufferSubData (will be remapped) */
+   "iiiii\0"
+   "glCopyNamedBufferSubData\0"
+   "\0"
+   /* _mesa_function_pool[2934]: BindSampler (will be remapped) */
    "ii\0"
    "glBindSampler\0"
    "\0"
-   /* _mesa_function_pool[2920]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[2952]: GetUniformuiv (will be remapped) */
+   "iip\0"
+   "glGetUniformuivEXT\0"
+   "glGetUniformuiv\0"
+   "\0"
+   /* _mesa_function_pool[2992]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[2964]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[3036]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[2984]: MultiTexCoord3iv (offset 397) */
+   /* _mesa_function_pool[3056]: MultiTexCoord3iv (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[3029]: Finish (offset 216) */
+   /* _mesa_function_pool[3101]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[3040]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[3112]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[3058]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[3130]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[3082]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[3154]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[3099]: VDPAURegisterOutputSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[3171]: VDPAURegisterOutputSurfaceNV (will be remapped) */
    "piip\0"
    "glVDPAURegisterOutputSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[3136]: VertexP4ui (will be remapped) */
+   /* _mesa_function_pool[3208]: VertexP4ui (will be remapped) */
    "ii\0"
    "glVertexP4ui\0"
    "\0"
-   /* _mesa_function_pool[3153]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[3225]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[3181]: TextureStorage3DMultisample (will be remapped) */
+   /* _mesa_function_pool[3253]: TextureStorage3DMultisample (will be remapped) */
    "iiiiiii\0"
    "glTextureStorage3DMultisample\0"
    "\0"
-   /* _mesa_function_pool[3220]: GetnUniformivARB (will be remapped) */
+   /* _mesa_function_pool[3292]: GetnUniformivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[3245]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[3317]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[3271]: BlendFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[3343]: BlendFuncSeparate (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "glBlendFuncSeparateOES\0"
    "\0"
-   /* _mesa_function_pool[3367]: Color3us (offset 23) */
+   /* _mesa_function_pool[3439]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[3383]: LoadMatrixx (will be remapped) */
+   /* _mesa_function_pool[3455]: LoadMatrixx (will be remapped) */
    "p\0"
    "glLoadMatrixxOES\0"
    "glLoadMatrixx\0"
    "\0"
-   /* _mesa_function_pool[3417]: BufferStorage (will be remapped) */
+   /* _mesa_function_pool[3489]: BufferStorage (will be remapped) */
    "iipi\0"
    "glBufferStorage\0"
    "\0"
-   /* _mesa_function_pool[3439]: Color3ub (offset 19) */
+   /* _mesa_function_pool[3511]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[3455]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[3527]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[3478]: Color3ui (offset 21) */
+   /* _mesa_function_pool[3550]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[3494]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[3566]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[3518]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[3590]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[3551]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[3623]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[3569]: DeleteProgramPipelines (will be remapped) */
+   /* _mesa_function_pool[3641]: DeleteProgramPipelines (will be remapped) */
    "ip\0"
    "glDeleteProgramPipelines\0"
    "glDeleteProgramPipelinesEXT\0"
    "\0"
-   /* _mesa_function_pool[3626]: LineWidthx (will be remapped) */
+   /* _mesa_function_pool[3698]: LineWidthx (will be remapped) */
    "i\0"
    "glLineWidthxOES\0"
    "glLineWidthx\0"
    "\0"
-   /* _mesa_function_pool[3658]: Indexdv (offset 45) */
+   /* _mesa_function_pool[3730]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[3671]: GetnPixelMapfvARB (will be remapped) */
+   /* _mesa_function_pool[3743]: GetnPixelMapfvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[3696]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[3768]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[3729]: DepthMask (offset 211) */
+   /* _mesa_function_pool[3801]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[3744]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[3816]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[3766]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[3838]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[3791]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[3863]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[3818]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[3890]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "glBlendFuncSeparateIndexedAMD\0"
    "glBlendFuncSeparatei\0"
    "\0"
-   /* _mesa_function_pool[3900]: PixelTexGenParameteriSGIS (dynamic) */
+   /* _mesa_function_pool[3972]: PixelTexGenParameteriSGIS (dynamic) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[3932]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[4004]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[3975]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[4047]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[4003]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[4075]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[4025]: GetCompressedTexImage (will be remapped) */
+   /* _mesa_function_pool[4097]: GetCompressedTexImage (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[4081]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[4153]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[4116]: UniformMatrix2dv (will be remapped) */
+   /* _mesa_function_pool[4188]: UniformMatrix2dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2dv\0"
    "\0"
-   /* _mesa_function_pool[4141]: GetQueryObjectui64v (will be remapped) */
+   /* _mesa_function_pool[4213]: GetQueryObjectui64v (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64v\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[4193]: VertexAttribP1uiv (will be remapped) */
+   /* _mesa_function_pool[4265]: VertexAttribP1uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP1uiv\0"
    "\0"
-   /* _mesa_function_pool[4219]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[4291]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[4234]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4306]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4266]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[4338]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[4288]: BindBuffersBase (will be remapped) */
+   /* _mesa_function_pool[4360]: BindBuffersBase (will be remapped) */
    "iiip\0"
    "glBindBuffersBase\0"
    "\0"
-   /* _mesa_function_pool[4312]: GenTextures (offset 328) */
+   /* _mesa_function_pool[4384]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[4347]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4419]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4375]: UniformMatrix3x2dv (will be remapped) */
+   /* _mesa_function_pool[4447]: UnmapNamedBuffer (will be remapped) */
+   "i\0"
+   "glUnmapNamedBuffer\0"
+   "\0"
+   /* _mesa_function_pool[4469]: UniformMatrix3x2dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2dv\0"
    "\0"
-   /* _mesa_function_pool[4402]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[4496]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[4426]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[4520]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[4452]: VertexAttribP4ui (will be remapped) */
+   /* _mesa_function_pool[4546]: VertexAttribP4ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP4ui\0"
    "\0"
-   /* _mesa_function_pool[4477]: Uniform4i (will be remapped) */
+   /* _mesa_function_pool[4571]: Uniform4i (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[4511]: Uniform4d (will be remapped) */
+   /* _mesa_function_pool[4605]: Uniform4d (will be remapped) */
    "idddd\0"
    "glUniform4d\0"
    "\0"
-   /* _mesa_function_pool[4530]: Uniform4f (will be remapped) */
+   /* _mesa_function_pool[4624]: Uniform4f (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[4564]: ProgramUniform3d (will be remapped) */
+   /* _mesa_function_pool[4658]: ProgramUniform3dv (will be remapped) */
+   "iiip\0"
+   "glProgramUniform3dv\0"
+   "\0"
+   /* _mesa_function_pool[4684]: GetNamedBufferParameteri64v (will be remapped) */
+   "iip\0"
+   "glGetNamedBufferParameteri64v\0"
+   "\0"
+   /* _mesa_function_pool[4719]: ProgramUniform3d (will be remapped) */
    "iiddd\0"
    "glProgramUniform3d\0"
    "\0"
-   /* _mesa_function_pool[4590]: ProgramUniform3f (will be remapped) */
+   /* _mesa_function_pool[4745]: ProgramUniform3f (will be remapped) */
    "iifff\0"
    "glProgramUniform3f\0"
    "glProgramUniform3fEXT\0"
    "\0"
-   /* _mesa_function_pool[4638]: ProgramUniform3i (will be remapped) */
+   /* _mesa_function_pool[4793]: ProgramUniform3i (will be remapped) */
    "iiiii\0"
    "glProgramUniform3i\0"
    "glProgramUniform3iEXT\0"
    "\0"
-   /* _mesa_function_pool[4686]: PointParameterfv (will be remapped) */
+   /* _mesa_function_pool[4841]: PointParameterfv (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[4776]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[4931]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[4836]: GetString (offset 275) */
+   /* _mesa_function_pool[4991]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[4851]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[5006]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[4877]: VDPAUUnmapSurfacesNV (will be remapped) */
+   /* _mesa_function_pool[5032]: VDPAUUnmapSurfacesNV (will be remapped) */
    "ip\0"
    "glVDPAUUnmapSurfacesNV\0"
    "\0"
-   /* _mesa_function_pool[4904]: GetnHistogramARB (will be remapped) */
+   /* _mesa_function_pool[5059]: GetnHistogramARB (will be remapped) */
    "iiiiip\0"
    "glGetnHistogramARB\0"
    "\0"
-   /* _mesa_function_pool[4931]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[5086]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[4984]: SecondaryColor3s (will be remapped) */
+   /* _mesa_function_pool[5139]: SecondaryColor3s (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[5030]: VertexAttribP2uiv (will be remapped) */
+   /* _mesa_function_pool[5185]: VertexAttribP2uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP2uiv\0"
    "\0"
-   /* _mesa_function_pool[5056]: UniformMatrix3x4dv (will be remapped) */
+   /* _mesa_function_pool[5211]: UniformMatrix3x4dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4dv\0"
    "\0"
-   /* _mesa_function_pool[5083]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[5238]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[5108]: SecondaryColor3b (will be remapped) */
+   /* _mesa_function_pool[5263]: SecondaryColor3b (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[5154]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[5309]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[5177]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[5332]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[5204]: SecondaryColor3i (will be remapped) */
+   /* _mesa_function_pool[5359]: SecondaryColor3i (will be remapped) */
    "iii\0"
    "glSecondaryColor3i\0"
    "glSecondaryColor3iEXT\0"
    "\0"
-   /* _mesa_function_pool[5250]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[5405]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[5276]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[5431]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[5309]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[5464]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[5334]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[5489]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "glFlushMappedBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[5392]: Lightfv (offset 160) */
+   /* _mesa_function_pool[5547]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[5407]: GetFramebufferAttachmentParameteriv (will be remapped) */
+   /* _mesa_function_pool[5562]: GetFramebufferAttachmentParameteriv (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "glGetFramebufferAttachmentParameterivOES\0"
    "\0"
-   /* _mesa_function_pool[5533]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[5688]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[5576]: EndPerfMonitorAMD (will be remapped) */
+   /* _mesa_function_pool[5731]: EndPerfMonitorAMD (will be remapped) */
    "i\0"
    "glEndPerfMonitorAMD\0"
    "\0"
-   /* _mesa_function_pool[5599]: Uniform1ui (will be remapped) */
-   "ii\0"
-   "glUniform1uiEXT\0"
-   "glUniform1ui\0"
+   /* _mesa_function_pool[5754]: ReadInstrumentsSGIX (dynamic) */
+   "i\0"
+   "glReadInstrumentsSGIX\0"
+   "\0"
+   /* _mesa_function_pool[5779]: CreateBuffers (will be remapped) */
+   "ip\0"
+   "glCreateBuffers\0"
    "\0"
-   /* _mesa_function_pool[5632]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[5799]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[5656]: GetMultisamplefv (will be remapped) */
+   /* _mesa_function_pool[5823]: GetMultisamplefv (will be remapped) */
    "iip\0"
    "glGetMultisamplefv\0"
    "\0"
-   /* _mesa_function_pool[5680]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[5847]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[5698]: Rectdv (offset 87) */
+   /* _mesa_function_pool[5865]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[5711]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[5878]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[5789]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[5956]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[5824]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[5991]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[5848]: SecondaryColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[6015]: SecondaryColorP3uiv (will be remapped) */
    "ip\0"
    "glSecondaryColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[5874]: GetnPixelMapuivARB (will be remapped) */
+   /* _mesa_function_pool[6041]: GetnPixelMapuivARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapuivARB\0"
    "\0"
-   /* _mesa_function_pool[5900]: GetSamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[6067]: GetSamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[5931]: Disablei (will be remapped) */
+   /* _mesa_function_pool[6098]: Disablei (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[5966]: CompressedTexSubImage3D (will be remapped) */
+   /* _mesa_function_pool[6133]: CompressedTexSubImage3D (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "glCompressedTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[6063]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[6230]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[6088]: Color3dv (offset 12) */
+   /* _mesa_function_pool[6255]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[6102]: BeginQuery (will be remapped) */
+   /* _mesa_function_pool[6269]: BeginQuery (will be remapped) */
    "ii\0"
    "glBeginQuery\0"
    "glBeginQueryARB\0"
    "\0"
-   /* _mesa_function_pool[6135]: VertexP3uiv (will be remapped) */
+   /* _mesa_function_pool[6302]: VertexP3uiv (will be remapped) */
    "ip\0"
    "glVertexP3uiv\0"
    "\0"
-   /* _mesa_function_pool[6153]: GetUniformLocation (will be remapped) */
+   /* _mesa_function_pool[6320]: GetUniformLocation (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[6202]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[6369]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[6220]: WindowPos2iv (will be remapped) */
+   /* _mesa_function_pool[6387]: WindowPos2iv (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[6275]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[6442]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[6293]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[6460]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[6319]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[6486]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[6351]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[6518]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[6378]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6545]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6424]: CheckFramebufferStatus (will be remapped) */
+   /* _mesa_function_pool[6591]: CheckFramebufferStatus (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "glCheckFramebufferStatusOES\0"
    "\0"
-   /* _mesa_function_pool[6508]: DispatchComputeIndirect (will be remapped) */
+   /* _mesa_function_pool[6675]: DispatchComputeIndirect (will be remapped) */
    "i\0"
    "glDispatchComputeIndirect\0"
    "\0"
-   /* _mesa_function_pool[6537]: InvalidateBufferData (will be remapped) */
+   /* _mesa_function_pool[6704]: InvalidateBufferData (will be remapped) */
    "i\0"
    "glInvalidateBufferData\0"
    "\0"
-   /* _mesa_function_pool[6563]: GetUniformdv (will be remapped) */
+   /* _mesa_function_pool[6730]: GetUniformdv (will be remapped) */
    "iip\0"
    "glGetUniformdv\0"
    "\0"
-   /* _mesa_function_pool[6583]: VDPAUMapSurfacesNV (will be remapped) */
+   /* _mesa_function_pool[6750]: VDPAUMapSurfacesNV (will be remapped) */
    "ip\0"
    "glVDPAUMapSurfacesNV\0"
    "\0"
-   /* _mesa_function_pool[6608]: IsFramebuffer (will be remapped) */
+   /* _mesa_function_pool[6775]: IsFramebuffer (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "glIsFramebufferOES\0"
    "\0"
-   /* _mesa_function_pool[6665]: GetPixelTexGenParameterfvSGIS (dynamic) */
+   /* _mesa_function_pool[6832]: GetPixelTexGenParameterfvSGIS (dynamic) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[6701]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[6868]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[6718]: GetObjectLabel (will be remapped) */
+   /* _mesa_function_pool[6885]: GetObjectLabel (will be remapped) */
    "iiipp\0"
    "glGetObjectLabel\0"
    "\0"
-   /* _mesa_function_pool[6742]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[6909]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[6763]: ColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[6930]: ColorP3uiv (will be remapped) */
    "ip\0"
    "glColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[6780]: CombinerParameteriNV (dynamic) */
+   /* _mesa_function_pool[6947]: CombinerParameteriNV (dynamic) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[6807]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6974]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6834]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[7001]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[6879]: SecondaryColor3ubv (will be remapped) */
+   /* _mesa_function_pool[7046]: SecondaryColor3ubv (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[6927]: GetDebugMessageLog (will be remapped) */
+   /* _mesa_function_pool[7094]: GetDebugMessageLog (will be remapped) */
    "iipppppp\0"
    "glGetDebugMessageLogARB\0"
    "glGetDebugMessageLog\0"
    "\0"
-   /* _mesa_function_pool[6982]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[7149]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[7021]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[7188]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[7045]: VertexAttribI4usv (will be remapped) */
+   /* _mesa_function_pool[7212]: VertexAttribI4usv (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
    "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[7092]: PixelTexGenParameterfSGIS (dynamic) */
+   /* _mesa_function_pool[7259]: PixelTexGenParameterfSGIS (dynamic) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[7124]: ProgramUniform2ui (will be remapped) */
+   /* _mesa_function_pool[7291]: ProgramUniform2ui (will be remapped) */
    "iiii\0"
    "glProgramUniform2ui\0"
    "glProgramUniform2uiEXT\0"
    "\0"
-   /* _mesa_function_pool[7173]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7340]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7202]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7369]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7229]: GetShaderSource (will be remapped) */
+   /* _mesa_function_pool[7396]: GetShaderSource (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[7274]: BindProgramARB (will be remapped) */
+   /* _mesa_function_pool[7441]: BindProgramARB (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[7311]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[7478]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[7336]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[7503]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[7367]: ProgramUniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[7534]: ProgramUniformMatrix4x3fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4x3fv\0"
    "glProgramUniformMatrix4x3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[7433]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[7600]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[7453]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[7620]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[7538]: GetQueryObjectuiv (will be remapped) */
+   /* _mesa_function_pool[7705]: GetQueryObjectuiv (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[7586]: VertexAttribI4bv (will be remapped) */
+   /* _mesa_function_pool[7753]: VertexAttribI4bv (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[7631]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[7798]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7662]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[7829]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[7683]: ListBase (offset 6) */
+   /* _mesa_function_pool[7850]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[7697]: GenerateMipmap (will be remapped) */
+   /* _mesa_function_pool[7864]: GenerateMipmap (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "glGenerateMipmapOES\0"
    "\0"
-   /* _mesa_function_pool[7757]: BindBufferRange (will be remapped) */
+   /* _mesa_function_pool[7924]: BindBufferRange (will be remapped) */
    "iiiii\0"
    "glBindBufferRange\0"
    "glBindBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[7803]: ProgramUniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[7970]: ProgramUniformMatrix2x4fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2x4fv\0"
    "glProgramUniformMatrix2x4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[7869]: BindBufferBase (will be remapped) */
+   /* _mesa_function_pool[8036]: BindBufferBase (will be remapped) */
    "iii\0"
    "glBindBufferBase\0"
    "glBindBufferBaseEXT\0"
    "\0"
-   /* _mesa_function_pool[7911]: GetQueryObjectiv (will be remapped) */
+   /* _mesa_function_pool[8078]: GetQueryObjectiv (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[7957]: VertexAttrib2s (will be remapped) */
+   /* _mesa_function_pool[8124]: VertexAttrib2s (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[7999]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[8166]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[8045]: VertexAttrib2d (will be remapped) */
+   /* _mesa_function_pool[8212]: VertexAttrib2d (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[8087]: Uniform1fv (will be remapped) */
+   /* _mesa_function_pool[8254]: Uniform1fv (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[8121]: GetProgramPipelineInfoLog (will be remapped) */
+   /* _mesa_function_pool[8288]: GetProgramPipelineInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramPipelineInfoLog\0"
    "glGetProgramPipelineInfoLogEXT\0"
    "\0"
-   /* _mesa_function_pool[8186]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[8353]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[8211]: ReadInstrumentsSGIX (dynamic) */
-   "i\0"
-   "glReadInstrumentsSGIX\0"
-   "\0"
-   /* _mesa_function_pool[8236]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[8378]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[8257]: WindowPos3fv (will be remapped) */
+   /* _mesa_function_pool[8399]: WindowPos3fv (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[8312]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[8454]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[8338]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[8480]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[8398]: PointParameteriv (will be remapped) */
+   /* _mesa_function_pool[8540]: PointParameteriv (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[8442]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[8584]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[8465]: BindRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[8607]: BindRenderbuffer (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[8510]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[8652]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[8556]: PrimitiveRestartIndex (will be remapped) */
+   /* _mesa_function_pool[8698]: PrimitiveRestartIndex (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndex\0"
    "glPrimitiveRestartIndexNV\0"
    "\0"
-   /* _mesa_function_pool[8609]: VertexAttribI4ubv (will be remapped) */
+   /* _mesa_function_pool[8751]: VertexAttribI4ubv (will be remapped) */
    "ip\0"
    "glVertexAttribI4ubvEXT\0"
    "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[8656]: GetGraphicsResetStatusARB (will be remapped) */
+   /* _mesa_function_pool[8798]: GetGraphicsResetStatusARB (will be remapped) */
    "\0"
    "glGetGraphicsResetStatusARB\0"
    "\0"
-   /* _mesa_function_pool[8686]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[8828]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[8712]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[8854]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[8738]: DepthRange (offset 288) */
+   /* _mesa_function_pool[8880]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[8755]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[8897]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[8783]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[8925]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[8809]: Uniform4fv (will be remapped) */
+   /* _mesa_function_pool[8951]: Uniform4fv (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[8843]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[8985]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[8869]: SamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[9011]: SamplerParameterIiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[8896]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[9038]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[8929]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[9071]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[8957]: Frustumf (will be remapped) */
+   /* _mesa_function_pool[9099]: Frustumf (will be remapped) */
    "ffffff\0"
    "glFrustumfOES\0"
    "glFrustumf\0"
    "\0"
-   /* _mesa_function_pool[8990]: ProgramUniform2uiv (will be remapped) */
+   /* _mesa_function_pool[9132]: ProgramUniform2uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform2uiv\0"
    "glProgramUniform2uivEXT\0"
    "\0"
-   /* _mesa_function_pool[9041]: Rectsv (offset 93) */
+   /* _mesa_function_pool[9183]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[9054]: Frustumx (will be remapped) */
+   /* _mesa_function_pool[9196]: Frustumx (will be remapped) */
    "iiiiii\0"
    "glFrustumxOES\0"
    "glFrustumx\0"
    "\0"
-   /* _mesa_function_pool[9087]: CullFace (offset 152) */
+   /* _mesa_function_pool[9229]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[9101]: BindTexture (offset 307) */
+   /* _mesa_function_pool[9243]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[9136]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[9278]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[9182]: MultiTexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[9324]: MultiTexCoordP2uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[9208]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[9350]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[9234]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[9376]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[9255]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[9397]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[9280]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[9422]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[9304]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[9446]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[9328]: VertexAttrib4bv (will be remapped) */
+   /* _mesa_function_pool[9470]: VertexAttrib4bv (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[9371]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[9513]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[9398]: SecondaryColor3usv (will be remapped) */
+   /* _mesa_function_pool[9540]: SecondaryColor3usv (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[9446]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[9588]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[9467]: Indexfv (offset 47) */
+   /* _mesa_function_pool[9609]: MapNamedBuffer (will be remapped) */
+   "ii\0"
+   "glMapNamedBuffer\0"
+   "\0"
+   /* _mesa_function_pool[9630]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[9480]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[9643]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[9510]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[9673]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[9536]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[9699]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[9552]: ProgramUniform2dv (will be remapped) */
+   /* _mesa_function_pool[9715]: ProgramUniform2dv (will be remapped) */
    "iiip\0"
    "glProgramUniform2dv\0"
    "\0"
-   /* _mesa_function_pool[9578]: MultiTexCoord3i (offset 396) */
+   /* _mesa_function_pool[9741]: MultiTexCoord3i (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[9623]: ProgramUniform1fv (will be remapped) */
+   /* _mesa_function_pool[9786]: ProgramUniform1fv (will be remapped) */
    "iiip\0"
    "glProgramUniform1fv\0"
    "glProgramUniform1fvEXT\0"
    "\0"
-   /* _mesa_function_pool[9672]: MultiTexCoord3d (offset 392) */
+   /* _mesa_function_pool[9835]: MultiTexCoord3d (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[9717]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[9880]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[9734]: Fogfv (offset 154) */
+   /* _mesa_function_pool[9897]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[9746]: Minmax (offset 368) */
+   /* _mesa_function_pool[9909]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[9772]: MultiTexCoord3s (offset 398) */
+   /* _mesa_function_pool[9935]: MultiTexCoord3s (offset 398) */
    "iiii\0"
    "glMultiTexCoord3s\0"
    "glMultiTexCoord3sARB\0"
    "\0"
-   /* _mesa_function_pool[9817]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[9980]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[9839]: GetFinalCombinerInputParameterfvNV (dynamic) */
+   /* _mesa_function_pool[10002]: GetFinalCombinerInputParameterfvNV (dynamic) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9881]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[10044]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[9906]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[10069]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[9921]: BufferSubData (will be remapped) */
+   /* _mesa_function_pool[10084]: BufferSubData (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[9962]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[10125]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[9998]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[10161]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[10028]: Begin (offset 7) */
+   /* _mesa_function_pool[10191]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[10039]: LightModeli (offset 165) */
+   /* _mesa_function_pool[10202]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[10057]: UniformMatrix2fv (will be remapped) */
+   /* _mesa_function_pool[10220]: UniformMatrix2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[10104]: LightModelf (offset 163) */
+   /* _mesa_function_pool[10267]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[10122]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[10285]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[10147]: TextureStorage1D (will be remapped) */
+   /* _mesa_function_pool[10310]: TextureStorage1D (will be remapped) */
    "iiii\0"
    "glTextureStorage1D\0"
    "\0"
-   /* _mesa_function_pool[10172]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[10335]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10198]: GetCombinerInputParameterivNV (dynamic) */
+   /* _mesa_function_pool[10361]: GetCombinerInputParameterivNV (dynamic) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[10237]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[10400]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[10266]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[10429]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[10311]: VertexAttrib4ubv (will be remapped) */
+   /* _mesa_function_pool[10474]: VertexAttrib4ubv (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[10356]: GetnTexImageARB (will be remapped) */
+   /* _mesa_function_pool[10519]: GetnTexImageARB (will be remapped) */
    "iiiiip\0"
    "glGetnTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[10382]: ColorMask (offset 210) */
+   /* _mesa_function_pool[10545]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[10400]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[10563]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[10425]: MultiTexCoord4x (will be remapped) */
+   /* _mesa_function_pool[10588]: MultiTexCoord4x (will be remapped) */
    "iiiii\0"
    "glMultiTexCoord4xOES\0"
    "glMultiTexCoord4x\0"
    "\0"
-   /* _mesa_function_pool[10471]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[10634]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[10508]: VertexAttribI4sv (will be remapped) */
+   /* _mesa_function_pool[10671]: VertexAttribI4sv (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
    "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[10553]: DrawElementsInstancedBaseInstance (will be remapped) */
+   /* _mesa_function_pool[10716]: DrawElementsInstancedBaseInstance (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseInstance\0"
    "\0"
-   /* _mesa_function_pool[10597]: UniformMatrix4fv (will be remapped) */
+   /* _mesa_function_pool[10760]: UniformMatrix4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[10644]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[10807]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[10671]: VertexAttrib4Nuiv (will be remapped) */
+   /* _mesa_function_pool[10834]: VertexAttrib4Nuiv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[10718]: ClientActiveTexture (offset 375) */
+   /* _mesa_function_pool[10881]: ClientActiveTexture (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[10768]: GetUniformIndices (will be remapped) */
+   /* _mesa_function_pool[10931]: GetUniformIndices (will be remapped) */
    "iipp\0"
    "glGetUniformIndices\0"
    "\0"
-   /* _mesa_function_pool[10794]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[10957]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[10825]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[10988]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[10846]: CombinerParameterivNV (dynamic) */
+   /* _mesa_function_pool[11009]: CombinerParameterivNV (dynamic) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[10874]: MultiTexCoord2sv (offset 391) */
+   /* _mesa_function_pool[11037]: MultiTexCoord2sv (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[10919]: LoadIdentity (offset 290) */
+   /* _mesa_function_pool[11082]: NamedBufferStorage (will be remapped) */
+   "iipi\0"
+   "glNamedBufferStorage\0"
+   "\0"
+   /* _mesa_function_pool[11109]: LoadIdentity (offset 290) */
    "\0"
    "glLoadIdentity\0"
    "\0"
-   /* _mesa_function_pool[10936]: ActiveShaderProgram (will be remapped) */
+   /* _mesa_function_pool[11126]: ActiveShaderProgram (will be remapped) */
    "ii\0"
    "glActiveShaderProgram\0"
    "glActiveShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[10987]: BindImageTextures (will be remapped) */
+   /* _mesa_function_pool[11177]: BindImageTextures (will be remapped) */
    "iip\0"
    "glBindImageTextures\0"
    "\0"
-   /* _mesa_function_pool[11012]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[11202]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[11043]: VertexAttrib4ubvNV (will be remapped) */
+   /* _mesa_function_pool[11233]: VertexAttrib4ubvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[11068]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[11258]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[11098]: GetMapfv (offset 267) */
+   /* _mesa_function_pool[11288]: GetMapfv (offset 267) */
    "iip\0"
    "glGetMapfv\0"
    "\0"
-   /* _mesa_function_pool[11114]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[11304]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[11140]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[11330]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[11168]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[11358]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11214]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[11404]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[11234]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[11424]: TextureBufferRange (will be remapped) */
+   "iiiii\0"
+   "glTextureBufferRange\0"
+   "\0"
+   /* _mesa_function_pool[11452]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[11252]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[11470]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[11276]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[11494]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[11325]: VDPAUSurfaceAccessNV (will be remapped) */
+   /* _mesa_function_pool[11543]: GetNamedBufferSubData (will be remapped) */
+   "iiip\0"
+   "glGetNamedBufferSubData\0"
+   "\0"
+   /* _mesa_function_pool[11573]: VDPAUSurfaceAccessNV (will be remapped) */
    "ii\0"
    "glVDPAUSurfaceAccessNV\0"
    "\0"
-   /* _mesa_function_pool[11352]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[11600]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[11374]: WindowPos2f (will be remapped) */
+   /* _mesa_function_pool[11622]: WindowPos2f (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
    "glWindowPos2fMESA\0"
    "\0"
-   /* _mesa_function_pool[11427]: WindowPos2d (will be remapped) */
+   /* _mesa_function_pool[11675]: WindowPos2d (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[11480]: WindowPos2i (will be remapped) */
+   /* _mesa_function_pool[11728]: WindowPos2i (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[11533]: WindowPos2s (will be remapped) */
+   /* _mesa_function_pool[11781]: WindowPos2s (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[11586]: VertexAttribI1uiEXT (will be remapped) */
+   /* _mesa_function_pool[11834]: VertexAttribI1uiEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1uiEXT\0"
    "glVertexAttribI1ui\0"
    "\0"
-   /* _mesa_function_pool[11631]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[11879]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[11647]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[11895]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[11669]: CompressedTexImage3D (will be remapped) */
+   /* _mesa_function_pool[11917]: CompressedTexImage3D (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "glCompressedTexImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[11755]: VertexAttribI1uiv (will be remapped) */
+   /* _mesa_function_pool[12003]: VertexAttribI1uiv (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[11802]: SecondaryColor3dv (will be remapped) */
+   /* _mesa_function_pool[12050]: SecondaryColor3dv (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[11848]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[12096]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11878]: GetnPixelMapusvARB (will be remapped) */
+   /* _mesa_function_pool[12126]: GetnPixelMapusvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapusvARB\0"
    "\0"
-   /* _mesa_function_pool[11904]: VertexAttrib3s (will be remapped) */
+   /* _mesa_function_pool[12152]: VertexAttrib3s (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[11947]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[12195]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[11974]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[12222]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[11995]: GetQueryiv (will be remapped) */
+   /* _mesa_function_pool[12243]: GetQueryiv (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[12029]: VertexAttrib3d (will be remapped) */
+   /* _mesa_function_pool[12277]: VertexAttrib3d (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[12072]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[12320]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[12106]: MapBuffer (will be remapped) */
+   /* _mesa_function_pool[12354]: MapNamedBufferRange (will be remapped) */
+   "iiii\0"
+   "glMapNamedBufferRange\0"
+   "\0"
+   /* _mesa_function_pool[12382]: MapBuffer (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "glMapBufferOES\0"
    "\0"
-   /* _mesa_function_pool[12152]: VertexAttrib4Nbv (will be remapped) */
+   /* _mesa_function_pool[12428]: VertexAttrib4Nbv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[12197]: ProgramBinary (will be remapped) */
+   /* _mesa_function_pool[12473]: ProgramBinary (will be remapped) */
    "iipi\0"
    "glProgramBinary\0"
    "glProgramBinaryOES\0"
    "\0"
-   /* _mesa_function_pool[12238]: InvalidateTexImage (will be remapped) */
+   /* _mesa_function_pool[12514]: InvalidateTexImage (will be remapped) */
    "ii\0"
    "glInvalidateTexImage\0"
    "\0"
-   /* _mesa_function_pool[12263]: Uniform4ui (will be remapped) */
+   /* _mesa_function_pool[12539]: Uniform4ui (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
    "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[12299]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[12575]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[12340]: GetBooleani_v (will be remapped) */
+   /* _mesa_function_pool[12616]: GetBooleani_v (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[12385]: DrawTexsOES (will be remapped) */
+   /* _mesa_function_pool[12661]: DrawTexsOES (will be remapped) */
    "iiiii\0"
    "glDrawTexsOES\0"
    "\0"
-   /* _mesa_function_pool[12406]: GetObjectPtrLabel (will be remapped) */
+   /* _mesa_function_pool[12682]: GetObjectPtrLabel (will be remapped) */
    "pipp\0"
    "glGetObjectPtrLabel\0"
    "\0"
-   /* _mesa_function_pool[12432]: ProgramParameteri (will be remapped) */
+   /* _mesa_function_pool[12708]: ProgramParameteri (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "glProgramParameteri\0"
    "glProgramParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[12503]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12779]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12541]: Color3fv (offset 14) */
+   /* _mesa_function_pool[12817]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[12555]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[12831]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[12581]: GetnMapfvARB (will be remapped) */
+   /* _mesa_function_pool[12857]: GetnMapfvARB (will be remapped) */
    "iiip\0"
    "glGetnMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[12602]: MultiTexCoord2i (offset 388) */
+   /* _mesa_function_pool[12878]: MultiTexCoord2i (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[12646]: MultiTexCoord2d (offset 384) */
+   /* _mesa_function_pool[12922]: MultiTexCoord2d (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[12690]: SamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[12966]: SamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[12718]: MultiTexCoord2s (offset 390) */
+   /* _mesa_function_pool[12994]: MultiTexCoord2s (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[12762]: VDPAURegisterVideoSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[13038]: VDPAURegisterVideoSurfaceNV (will be remapped) */
    "piip\0"
    "glVDPAURegisterVideoSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[12798]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[13074]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[12851]: Indexub (offset 315) */
+   /* _mesa_function_pool[13127]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[12864]: GetPerfMonitorCounterDataAMD (will be remapped) */
+   /* _mesa_function_pool[13140]: GetPerfMonitorCounterDataAMD (will be remapped) */
    "iiipp\0"
    "glGetPerfMonitorCounterDataAMD\0"
    "\0"
-   /* _mesa_function_pool[12902]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13178]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12947]: MultTransposeMatrixf (will be remapped) */
+   /* _mesa_function_pool[13223]: MultTransposeMatrixf (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[12999]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[13275]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[13022]: Scalex (will be remapped) */
+   /* _mesa_function_pool[13298]: Scalex (will be remapped) */
    "iii\0"
    "glScalexOES\0"
    "glScalex\0"
    "\0"
-   /* _mesa_function_pool[13048]: Scaled (offset 301) */
+   /* _mesa_function_pool[13324]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[13062]: Scalef (offset 302) */
+   /* _mesa_function_pool[13338]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[13076]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[13352]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[13100]: GetUniformfv (will be remapped) */
+   /* _mesa_function_pool[13376]: GetUniformfv (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[13138]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[13414]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[13172]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[13448]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[13196]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[13472]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[13218]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13494]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13247]: QueryCounter (will be remapped) */
+   /* _mesa_function_pool[13523]: QueryCounter (will be remapped) */
    "ii\0"
    "glQueryCounter\0"
    "\0"
-   /* _mesa_function_pool[13266]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[13542]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[13291]: ProgramUniform3iv (will be remapped) */
+   /* _mesa_function_pool[13567]: ProgramUniform3iv (will be remapped) */
    "iiip\0"
    "glProgramUniform3iv\0"
    "glProgramUniform3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[13340]: ProgramUniformMatrix2dv (will be remapped) */
+   /* _mesa_function_pool[13616]: ProgramUniformMatrix2dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2dv\0"
    "\0"
-   /* _mesa_function_pool[13373]: ClearTexSubImage (will be remapped) */
+   /* _mesa_function_pool[13649]: ClearTexSubImage (will be remapped) */
    "iiiiiiiiiip\0"
    "glClearTexSubImage\0"
    "\0"
-   /* _mesa_function_pool[13405]: GetActiveUniformBlockName (will be remapped) */
+   /* _mesa_function_pool[13681]: GetActiveUniformBlockName (will be remapped) */
    "iiipp\0"
    "glGetActiveUniformBlockName\0"
    "\0"
-   /* _mesa_function_pool[13440]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[13716]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[13472]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[13748]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[13490]: ColorMaski (will be remapped) */
+   /* _mesa_function_pool[13766]: ColorMaski (will be remapped) */
    "iiiii\0"
    "glColorMaskIndexedEXT\0"
    "glColorMaski\0"
    "\0"
-   /* _mesa_function_pool[13532]: Uniform2uiv (will be remapped) */
+   /* _mesa_function_pool[13808]: Uniform2uiv (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[13568]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[13844]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[13587]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[13863]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[13606]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[13882]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[13625]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[13901]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "glBindVertexArrayOES\0"
    "\0"
-   /* _mesa_function_pool[13667]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[13943]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[13686]: GetTexParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[13962]: GetTexParameterIuiv (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[13738]: DrawTransformFeedbackStreamInstanced (will be remapped) */
+   /* _mesa_function_pool[14014]: DrawTransformFeedbackStreamInstanced (will be remapped) */
    "iiii\0"
    "glDrawTransformFeedbackStreamInstanced\0"
    "\0"
-   /* _mesa_function_pool[13783]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[14059]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[13826]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[14102]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13856]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[14132]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[13898]: ProgramUniformMatrix4x3dv (will be remapped) */
+   /* _mesa_function_pool[14174]: ProgramUniformMatrix4x3dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4x3dv\0"
    "\0"
-   /* _mesa_function_pool[13933]: IsFenceNV (dynamic) */
+   /* _mesa_function_pool[14209]: IsFenceNV (dynamic) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[13948]: ColorTable (offset 339) */
+   /* _mesa_function_pool[14224]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[14001]: LoadName (offset 198) */
+   /* _mesa_function_pool[14277]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[14015]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[14291]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[14044]: GetnUniformuivARB (will be remapped) */
+   /* _mesa_function_pool[14320]: GetnUniformuivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformuivARB\0"
    "\0"
-   /* _mesa_function_pool[14070]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[14346]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[14086]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[14362]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[14144]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[14420]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[14165]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[14441]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[14184]: MultiTexCoordP1ui (will be remapped) */
+   /* _mesa_function_pool[14460]: FlushMappedNamedBufferRange (will be remapped) */
+   "iii\0"
+   "glFlushMappedNamedBufferRange\0"
+   "\0"
+   /* _mesa_function_pool[14495]: MultiTexCoordP1ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP1ui\0"
    "\0"
-   /* _mesa_function_pool[14209]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[14520]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[14228]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[14539]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[14243]: SelectPerfMonitorCountersAMD (will be remapped) */
+   /* _mesa_function_pool[14554]: SelectPerfMonitorCountersAMD (will be remapped) */
    "iiiip\0"
    "glSelectPerfMonitorCountersAMD\0"
    "\0"
-   /* _mesa_function_pool[14281]: TextureStorage2D (will be remapped) */
+   /* _mesa_function_pool[14592]: TextureStorage2D (will be remapped) */
    "iiiii\0"
    "glTextureStorage2D\0"
    "\0"
-   /* _mesa_function_pool[14307]: GetTextureParameterIiv (will be remapped) */
+   /* _mesa_function_pool[14618]: GetTextureParameterIiv (will be remapped) */
    "iip\0"
    "glGetTextureParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[14337]: BindFramebuffer (will be remapped) */
+   /* _mesa_function_pool[14648]: BindFramebuffer (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferOES\0"
    "\0"
-   /* _mesa_function_pool[14380]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[14691]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[14398]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[14709]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[14432]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[14743]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[14458]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[14769]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[14484]: GetActiveUniformsiv (will be remapped) */
+   /* _mesa_function_pool[14795]: GetActiveUniformsiv (will be remapped) */
    "iipip\0"
    "glGetActiveUniformsiv\0"
    "\0"
-   /* _mesa_function_pool[14513]: VertexAttrib2sv (will be remapped) */
+   /* _mesa_function_pool[14824]: VertexAttrib2sv (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[14556]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[14867]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[14591]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14902]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14619]: Uniform1dv (will be remapped) */
+   /* _mesa_function_pool[14930]: Uniform1dv (will be remapped) */
    "iip\0"
    "glUniform1dv\0"
    "\0"
-   /* _mesa_function_pool[14637]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[14948]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[14673]: PushDebugGroup (will be remapped) */
+   /* _mesa_function_pool[14984]: PushDebugGroup (will be remapped) */
    "iiip\0"
    "glPushDebugGroup\0"
    "\0"
-   /* _mesa_function_pool[14696]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[15007]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[14744]: GetPerfMonitorGroupStringAMD (will be remapped) */
+   /* _mesa_function_pool[15055]: GetPerfMonitorGroupStringAMD (will be remapped) */
    "iipp\0"
    "glGetPerfMonitorGroupStringAMD\0"
    "\0"
-   /* _mesa_function_pool[14781]: GetError (offset 261) */
+   /* _mesa_function_pool[15092]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[14794]: PassThrough (offset 199) */
+   /* _mesa_function_pool[15105]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[14811]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[15122]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[14841]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[15152]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[14875]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[15186]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[14903]: BindBuffersRange (will be remapped) */
+   /* _mesa_function_pool[15214]: BindBuffersRange (will be remapped) */
    "iiippp\0"
    "glBindBuffersRange\0"
    "\0"
-   /* _mesa_function_pool[14930]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[15241]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[14973]: WindowPos3dv (will be remapped) */
+   /* _mesa_function_pool[15284]: WindowPos3dv (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15028]: TexGenxOES (will be remapped) */
+   /* _mesa_function_pool[15339]: TexGenxOES (will be remapped) */
    "iii\0"
    "glTexGenxOES\0"
    "\0"
-   /* _mesa_function_pool[15046]: DeleteFencesNV (dynamic) */
+   /* _mesa_function_pool[15357]: DeleteFencesNV (dynamic) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[15067]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[15378]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[15105]: StencilOp (offset 244) */
+   /* _mesa_function_pool[15416]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[15122]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[15433]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[15143]: ProgramUniform1iv (will be remapped) */
+   /* _mesa_function_pool[15454]: ProgramUniform1iv (will be remapped) */
    "iiip\0"
    "glProgramUniform1iv\0"
    "glProgramUniform1ivEXT\0"
    "\0"
-   /* _mesa_function_pool[15192]: ProgramUniform3ui (will be remapped) */
+   /* _mesa_function_pool[15503]: ProgramUniform3ui (will be remapped) */
    "iiiii\0"
    "glProgramUniform3ui\0"
    "glProgramUniform3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[15242]: SecondaryColor3sv (will be remapped) */
+   /* _mesa_function_pool[15553]: SecondaryColor3sv (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[15288]: TexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[15599]: TexCoordP3ui (will be remapped) */
    "ii\0"
    "glTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[15307]: Fogxv (will be remapped) */
+   /* _mesa_function_pool[15618]: Fogxv (will be remapped) */
    "ip\0"
    "glFogxvOES\0"
    "glFogxv\0"
    "\0"
-   /* _mesa_function_pool[15330]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[15641]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[15357]: VertexAttribP1ui (will be remapped) */
+   /* _mesa_function_pool[15668]: VertexAttribP1ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP1ui\0"
    "\0"
-   /* _mesa_function_pool[15382]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[15693]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[15400]: LogicOp (offset 242) */
+   /* _mesa_function_pool[15711]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[15413]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[15724]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[15489]: WindowPos3d (will be remapped) */
+   /* _mesa_function_pool[15800]: WindowPos3d (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[15543]: Enablei (will be remapped) */
+   /* _mesa_function_pool[15854]: Enablei (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[15576]: WindowPos3f (will be remapped) */
+   /* _mesa_function_pool[15887]: WindowPos3f (will be remapped) */
    "fff\0"
    "glWindowPos3f\0"
    "glWindowPos3fARB\0"
    "glWindowPos3fMESA\0"
    "\0"
-   /* _mesa_function_pool[15630]: GenProgramsARB (will be remapped) */
+   /* _mesa_function_pool[15941]: GenProgramsARB (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[15667]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[15978]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[15685]: WindowPos3i (will be remapped) */
+   /* _mesa_function_pool[15996]: WindowPos3i (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[15739]: MultiTexCoord4iv (offset 405) */
+   /* _mesa_function_pool[16050]: MultiTexCoord4iv (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[15784]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[16095]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[15801]: WindowPos3s (will be remapped) */
+   /* _mesa_function_pool[16112]: WindowPos3s (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[15855]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[16166]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[15874]: DebugMessageInsert (will be remapped) */
+   /* _mesa_function_pool[16185]: DebugMessageInsert (will be remapped) */
    "iiiiip\0"
    "glDebugMessageInsertARB\0"
    "glDebugMessageInsert\0"
    "\0"
-   /* _mesa_function_pool[15927]: Orthof (will be remapped) */
+   /* _mesa_function_pool[16238]: Orthof (will be remapped) */
    "ffffff\0"
    "glOrthofOES\0"
    "glOrthof\0"
    "\0"
-   /* _mesa_function_pool[15956]: CompressedTexImage2D (will be remapped) */
+   /* _mesa_function_pool[16267]: CompressedTexImage2D (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[16015]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[16326]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[16036]: ProgramUniformMatrix2x3dv (will be remapped) */
+   /* _mesa_function_pool[16347]: ProgramUniformMatrix2x3dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2x3dv\0"
    "\0"
-   /* _mesa_function_pool[16071]: IsSync (will be remapped) */
+   /* _mesa_function_pool[16382]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[16083]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[16394]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[16098]: MultiTexCoord1sv (offset 383) */
+   /* _mesa_function_pool[16409]: MultiTexCoord1sv (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[16143]: Orthox (will be remapped) */
+   /* _mesa_function_pool[16454]: Orthox (will be remapped) */
    "iiiiii\0"
    "glOrthoxOES\0"
    "glOrthox\0"
    "\0"
-   /* _mesa_function_pool[16172]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[16483]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[16188]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[16499]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[16206]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[16517]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[16222]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16533]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16263]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[16574]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[16285]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[16596]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[16303]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[16614]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[16321]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[16632]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[16339]: InvalidateSubFramebuffer (will be remapped) */
+   /* _mesa_function_pool[16650]: InvalidateSubFramebuffer (will be remapped) */
    "iipiiii\0"
    "glInvalidateSubFramebuffer\0"
    "\0"
-   /* _mesa_function_pool[16375]: Color4ub (offset 35) */
+   /* _mesa_function_pool[16686]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[16392]: UniformMatrix2x4dv (will be remapped) */
+   /* _mesa_function_pool[16703]: UniformMatrix2x4dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4dv\0"
    "\0"
-   /* _mesa_function_pool[16419]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[16730]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[16437]: VertexP2uiv (will be remapped) */
+   /* _mesa_function_pool[16748]: VertexP2uiv (will be remapped) */
    "ip\0"
    "glVertexP2uiv\0"
    "\0"
-   /* _mesa_function_pool[16455]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[16766]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16490]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[16801]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[16517]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[16828]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[16552]: MultiTexCoord3dv (offset 393) */
+   /* _mesa_function_pool[16863]: MultiTexCoord3dv (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[16597]: BindProgramPipeline (will be remapped) */
+   /* _mesa_function_pool[16908]: BindProgramPipeline (will be remapped) */
    "i\0"
    "glBindProgramPipeline\0"
    "glBindProgramPipelineEXT\0"
    "\0"
-   /* _mesa_function_pool[16647]: VertexAttribP4uiv (will be remapped) */
+   /* _mesa_function_pool[16958]: VertexAttribP4uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP4uiv\0"
    "\0"
-   /* _mesa_function_pool[16673]: DebugMessageCallback (will be remapped) */
+   /* _mesa_function_pool[16984]: DebugMessageCallback (will be remapped) */
    "pp\0"
    "glDebugMessageCallbackARB\0"
    "glDebugMessageCallback\0"
    "\0"
-   /* _mesa_function_pool[16726]: MultiTexCoord1i (offset 380) */
+   /* _mesa_function_pool[17037]: MultiTexCoord1i (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[16769]: WindowPos2dv (will be remapped) */
+   /* _mesa_function_pool[17080]: WindowPos2dv (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[16824]: TexParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[17135]: TexParameterIuiv (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[16870]: DeletePerfQueryINTEL (will be remapped) */
+   /* _mesa_function_pool[17181]: DeletePerfQueryINTEL (will be remapped) */
    "i\0"
    "glDeletePerfQueryINTEL\0"
    "\0"
-   /* _mesa_function_pool[16896]: MultiTexCoord1d (offset 376) */
+   /* _mesa_function_pool[17207]: MultiTexCoord1d (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[16939]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[17250]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[16966]: MultiTexCoord1s (offset 382) */
+   /* _mesa_function_pool[17277]: MultiTexCoord1s (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[17009]: BeginConditionalRender (will be remapped) */
+   /* _mesa_function_pool[17320]: BeginConditionalRender (will be remapped) */
    "ii\0"
    "glBeginConditionalRender\0"
    "glBeginConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[17065]: LoadPaletteFromModelViewMatrixOES (dynamic) */
+   /* _mesa_function_pool[17376]: LoadPaletteFromModelViewMatrixOES (dynamic) */
    "\0"
    "glLoadPaletteFromModelViewMatrixOES\0"
    "\0"
-   /* _mesa_function_pool[17103]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[17414]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[17122]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17433]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17156]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[17467]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[17218]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[17529]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[17239]: UniformMatrix4dv (will be remapped) */
+   /* _mesa_function_pool[17550]: UniformMatrix4dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4dv\0"
    "\0"
-   /* _mesa_function_pool[17264]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[17575]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[17292]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[17603]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[17319]: GetTexParameterxv (will be remapped) */
+   /* _mesa_function_pool[17630]: GetTexParameterxv (will be remapped) */
    "iip\0"
    "glGetTexParameterxvOES\0"
    "glGetTexParameterxv\0"
    "\0"
-   /* _mesa_function_pool[17367]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[17678]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[17394]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[17705]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[17416]: Materialiv (offset 172) */
+   /* _mesa_function_pool[17727]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[17434]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[17745]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[17463]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[17774]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[17482]: DrawElementsInstancedBaseVertex (will be remapped) */
+   /* _mesa_function_pool[17793]: DrawElementsInstancedBaseVertex (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[17524]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[17835]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[17548]: TexGeni (offset 192) */
+   /* _mesa_function_pool[17859]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "glTexGeniOES\0"
    "\0"
-   /* _mesa_function_pool[17576]: TexGenf (offset 190) */
+   /* _mesa_function_pool[17887]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "glTexGenfOES\0"
    "\0"
-   /* _mesa_function_pool[17604]: TexGend (offset 188) */
+   /* _mesa_function_pool[17915]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[17619]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[17930]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[17646]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[17957]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[17675]: Color4sv (offset 34) */
+   /* _mesa_function_pool[17986]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[17689]: GetCombinerInputParameterfvNV (dynamic) */
+   /* _mesa_function_pool[18000]: GetCombinerInputParameterfvNV (dynamic) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17728]: LoadTransposeMatrixf (will be remapped) */
+   /* _mesa_function_pool[18039]: LoadTransposeMatrixf (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[17780]: LoadTransposeMatrixd (will be remapped) */
+   /* _mesa_function_pool[18091]: LoadTransposeMatrixd (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[17832]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[18143]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[17848]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[18159]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[17906]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[18217]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[17962]: IsTexture (offset 330) */
+   /* _mesa_function_pool[18273]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[17992]: ProgramUniform3uiv (will be remapped) */
+   /* _mesa_function_pool[18303]: ProgramUniform3uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform3uiv\0"
    "glProgramUniform3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[18043]: GetTextureImage (will be remapped) */
+   /* _mesa_function_pool[18354]: GetTextureImage (will be remapped) */
    "iiiiip\0"
    "glGetTextureImage\0"
    "\0"
-   /* _mesa_function_pool[18069]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[18380]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[18104]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[18415]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[18130]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[18441]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[18146]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[18457]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[18169]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[18480]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[18218]: IsBuffer (will be remapped) */
+   /* _mesa_function_pool[18529]: IsBuffer (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[18246]: ColorP4ui (will be remapped) */
+   /* _mesa_function_pool[18557]: ColorP4ui (will be remapped) */
    "ii\0"
    "glColorP4ui\0"
    "\0"
-   /* _mesa_function_pool[18262]: TextureStorage3D (will be remapped) */
+   /* _mesa_function_pool[18573]: TextureStorage3D (will be remapped) */
    "iiiiii\0"
    "glTextureStorage3D\0"
    "\0"
-   /* _mesa_function_pool[18289]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[18600]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[18316]: TexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[18627]: TexCoordP3uiv (will be remapped) */
    "ip\0"
    "glTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[18336]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[18647]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[18355]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[18666]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[18372]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[18683]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[18398]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[18709]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[18426]: Uniform1iv (will be remapped) */
+   /* _mesa_function_pool[18737]: Uniform1iv (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[18460]: Uniform4uiv (will be remapped) */
+   /* _mesa_function_pool[18771]: Uniform4uiv (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[18496]: PopDebugGroup (will be remapped) */
+   /* _mesa_function_pool[18807]: PopDebugGroup (will be remapped) */
    "\0"
    "glPopDebugGroup\0"
    "\0"
-   /* _mesa_function_pool[18514]: VertexAttrib1d (will be remapped) */
+   /* _mesa_function_pool[18825]: VertexAttrib1d (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[18555]: CompressedTexImage1D (will be remapped) */
+   /* _mesa_function_pool[18866]: CompressedTexImage1D (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[18613]: TexBufferRange (will be remapped) */
+   /* _mesa_function_pool[18924]: NamedBufferSubData (will be remapped) */
+   "iiip\0"
+   "glNamedBufferSubData\0"
+   "\0"
+   /* _mesa_function_pool[18951]: TexBufferRange (will be remapped) */
    "iiiii\0"
    "glTexBufferRange\0"
    "\0"
-   /* _mesa_function_pool[18637]: VertexAttrib1s (will be remapped) */
+   /* _mesa_function_pool[18975]: VertexAttrib1s (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[18678]: MultiDrawElementsIndirect (will be remapped) */
+   /* _mesa_function_pool[19016]: MultiDrawElementsIndirect (will be remapped) */
    "iipii\0"
    "glMultiDrawElementsIndirect\0"
    "\0"
-   /* _mesa_function_pool[18713]: UniformMatrix4x3dv (will be remapped) */
+   /* _mesa_function_pool[19051]: UniformMatrix4x3dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3dv\0"
    "\0"
-   /* _mesa_function_pool[18740]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[19078]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[18772]: BeginPerfMonitorAMD (will be remapped) */
+   /* _mesa_function_pool[19110]: BeginPerfMonitorAMD (will be remapped) */
    "i\0"
    "glBeginPerfMonitorAMD\0"
    "\0"
-   /* _mesa_function_pool[18797]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[19135]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[18889]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[19227]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[18934]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[19272]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[18965]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[19303]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[18980]: GetnMapdvARB (will be remapped) */
+   /* _mesa_function_pool[19318]: GetnMapdvARB (will be remapped) */
    "iiip\0"
    "glGetnMapdvARB\0"
    "\0"
-   /* _mesa_function_pool[19001]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[19339]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[19025]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[19363]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[19052]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[19390]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[19076]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[19414]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[19095]: ViewportArrayv (will be remapped) */
+   /* _mesa_function_pool[19433]: ViewportArrayv (will be remapped) */
    "iip\0"
    "glViewportArrayv\0"
    "\0"
-   /* _mesa_function_pool[19117]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19455]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19188]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[19526]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[19241]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19579]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19286]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[19624]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[19322]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[19660]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[19346]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[19684]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[19375]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[19713]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[19393]: Fogiv (offset 156) */
+   /* _mesa_function_pool[19731]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[19405]: EndQuery (will be remapped) */
+   /* _mesa_function_pool[19743]: EndQuery (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[19433]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[19771]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[19450]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[19788]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[19467]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[19805]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[19494]: Clear (offset 203) */
+   /* _mesa_function_pool[19832]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[19505]: VertexAttrib4sv (will be remapped) */
+   /* _mesa_function_pool[19843]: VertexAttrib4sv (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[19548]: Ortho (offset 296) */
+   /* _mesa_function_pool[19886]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[19564]: Uniform3uiv (will be remapped) */
+   /* _mesa_function_pool[19902]: Uniform3uiv (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[19600]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[19938]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "glMatrixIndexPointerOES\0"
    "\0"
-   /* _mesa_function_pool[19654]: EndQueryIndexed (will be remapped) */
+   /* _mesa_function_pool[19992]: EndQueryIndexed (will be remapped) */
    "ii\0"
    "glEndQueryIndexed\0"
    "\0"
-   /* _mesa_function_pool[19676]: TexParameterxv (will be remapped) */
+   /* _mesa_function_pool[20014]: TexParameterxv (will be remapped) */
    "iip\0"
    "glTexParameterxvOES\0"
    "glTexParameterxv\0"
    "\0"
-   /* _mesa_function_pool[19718]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[20056]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[19755]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[20093]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[19790]: ProgramUniformMatrix2fv (will be remapped) */
+   /* _mesa_function_pool[20128]: ProgramUniformMatrix2fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2fv\0"
    "glProgramUniformMatrix2fvEXT\0"
    "\0"
-   /* _mesa_function_pool[19852]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[20190]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[19887]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[20225]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[19913]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[20251]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[19933]: Uniform4dv (will be remapped) */
+   /* _mesa_function_pool[20271]: Uniform4dv (will be remapped) */
    "iip\0"
    "glUniform4dv\0"
    "\0"
-   /* _mesa_function_pool[19951]: LightModelx (will be remapped) */
+   /* _mesa_function_pool[20289]: LightModelx (will be remapped) */
    "ii\0"
    "glLightModelxOES\0"
    "glLightModelx\0"
    "\0"
-   /* _mesa_function_pool[19986]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[20324]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[20031]: ClearColorx (will be remapped) */
+   /* _mesa_function_pool[20369]: ClearColorx (will be remapped) */
    "iiii\0"
    "glClearColorxOES\0"
    "glClearColorx\0"
    "\0"
-   /* _mesa_function_pool[20068]: EndTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[20406]: EndTransformFeedback (will be remapped) */
    "\0"
    "glEndTransformFeedback\0"
    "glEndTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[20119]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[20457]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[20137]: GetProgramBinary (will be remapped) */
+   /* _mesa_function_pool[20475]: GetProgramBinary (will be remapped) */
    "iippp\0"
    "glGetProgramBinary\0"
    "glGetProgramBinaryOES\0"
    "\0"
-   /* _mesa_function_pool[20185]: ViewportIndexedfv (will be remapped) */
+   /* _mesa_function_pool[20523]: ViewportIndexedfv (will be remapped) */
    "ip\0"
    "glViewportIndexedfv\0"
    "\0"
-   /* _mesa_function_pool[20209]: BindTextureUnit (will be remapped) */
+   /* _mesa_function_pool[20547]: BindTextureUnit (will be remapped) */
    "ii\0"
    "glBindTextureUnit\0"
    "\0"
-   /* _mesa_function_pool[20231]: CallList (offset 2) */
+   /* _mesa_function_pool[20569]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[20245]: Materialfv (offset 170) */
+   /* _mesa_function_pool[20583]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[20263]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[20601]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[20282]: GetActiveAtomicCounterBufferiv (will be remapped) */
+   /* _mesa_function_pool[20620]: GetActiveAtomicCounterBufferiv (will be remapped) */
    "iiip\0"
    "glGetActiveAtomicCounterBufferiv\0"
    "\0"
-   /* _mesa_function_pool[20321]: TexParameterIiv (will be remapped) */
+   /* _mesa_function_pool[20659]: TexParameterIiv (will be remapped) */
    "iip\0"
    "glTexParameterIivEXT\0"
    "glTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[20365]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[20703]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[20387]: FlushVertexArrayRangeNV (dynamic) */
+   /* _mesa_function_pool[20725]: FlushVertexArrayRangeNV (dynamic) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[20415]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[20753]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[20470]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[20808]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[20505]: Uniform2iv (will be remapped) */
+   /* _mesa_function_pool[20843]: Uniform2iv (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[20539]: GetFixedv (will be remapped) */
+   /* _mesa_function_pool[20877]: GetFixedv (will be remapped) */
    "ip\0"
    "glGetFixedvOES\0"
    "glGetFixedv\0"
    "\0"
-   /* _mesa_function_pool[20570]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[20908]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[20601]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[20939]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[20621]: SampleCoveragex (will be remapped) */
+   /* _mesa_function_pool[20959]: SampleCoveragex (will be remapped) */
    "ii\0"
    "glSampleCoveragexOES\0"
    "glSampleCoveragex\0"
    "\0"
-   /* _mesa_function_pool[20664]: GetPerfQueryInfoINTEL (will be remapped) */
+   /* _mesa_function_pool[21002]: GetPerfQueryInfoINTEL (will be remapped) */
    "iippppp\0"
    "glGetPerfQueryInfoINTEL\0"
    "\0"
-   /* _mesa_function_pool[20697]: DeleteFramebuffers (will be remapped) */
+   /* _mesa_function_pool[21035]: DeleteFramebuffers (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "glDeleteFramebuffersOES\0"
    "\0"
-   /* _mesa_function_pool[20770]: CombinerInputNV (dynamic) */
+   /* _mesa_function_pool[21108]: CombinerInputNV (dynamic) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[20796]: VertexAttrib4uiv (will be remapped) */
+   /* _mesa_function_pool[21134]: VertexAttrib4uiv (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[20841]: VertexAttrib4Nsv (will be remapped) */
+   /* _mesa_function_pool[21179]: VertexAttrib4Nsv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[20886]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[21224]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[20903]: VertexAttribI2iEXT (will be remapped) */
+   /* _mesa_function_pool[21241]: VertexAttribI2iEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2iEXT\0"
    "glVertexAttribI2i\0"
    "\0"
-   /* _mesa_function_pool[20947]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[21285]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[20964]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[21302]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[20981]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[21319]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "glGetTexGenfvOES\0"
    "\0"
-   /* _mesa_function_pool[21017]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[21355]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[21034]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[21372]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[21065]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[21403]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[21096]: GetVertexAttribIuiv (will be remapped) */
+   /* _mesa_function_pool[21434]: GetVertexAttribIuiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribIuivEXT\0"
    "glGetVertexAttribIuiv\0"
    "\0"
-   /* _mesa_function_pool[21148]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[21486]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[21167]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[21505]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[21182]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[21520]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[21213]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[21551]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[21235]: StencilMask (offset 209) */
+   /* _mesa_function_pool[21573]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[21252]: IsList (offset 287) */
+   /* _mesa_function_pool[21590]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[21264]: GetIntegeri_v (will be remapped) */
+   /* _mesa_function_pool[21602]: ClearBufferiv (will be remapped) */
+   "iip\0"
+   "glClearBufferiv\0"
+   "\0"
+   /* _mesa_function_pool[21623]: GetIntegeri_v (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[21309]: ProgramUniform2iv (will be remapped) */
+   /* _mesa_function_pool[21668]: ProgramUniform2iv (will be remapped) */
    "iiip\0"
    "glProgramUniform2iv\0"
    "glProgramUniform2ivEXT\0"
    "\0"
-   /* _mesa_function_pool[21358]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[21717]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[21384]: FogCoordPointer (will be remapped) */
+   /* _mesa_function_pool[21743]: FogCoordPointer (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[21428]: SecondaryColor3us (will be remapped) */
+   /* _mesa_function_pool[21787]: SecondaryColor3us (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[21476]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[21835]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[21515]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[21874]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[21537]: SecondaryColor3ub (will be remapped) */
+   /* _mesa_function_pool[21896]: SecondaryColor3ub (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[21585]: GetActiveUniformName (will be remapped) */
+   /* _mesa_function_pool[21944]: GetActiveUniformName (will be remapped) */
    "iiipp\0"
    "glGetActiveUniformName\0"
    "\0"
-   /* _mesa_function_pool[21615]: SecondaryColor3ui (will be remapped) */
+   /* _mesa_function_pool[21974]: SecondaryColor3ui (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[21663]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[22022]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[21710]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[22069]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[21730]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[22089]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[21759]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[22118]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[21782]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[22141]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[21802]: TextureBuffer (will be remapped) */
+   /* _mesa_function_pool[22161]: TextureBuffer (will be remapped) */
    "iii\0"
    "glTextureBuffer\0"
    "\0"
-   /* _mesa_function_pool[21823]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[22182]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[21853]: InitNames (offset 197) */
+   /* _mesa_function_pool[22212]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[21867]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[22226]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[21882]: DeleteQueries (will be remapped) */
+   /* _mesa_function_pool[22241]: DeleteQueries (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[21921]: InvalidateFramebuffer (will be remapped) */
+   /* _mesa_function_pool[22280]: InvalidateFramebuffer (will be remapped) */
    "iip\0"
    "glInvalidateFramebuffer\0"
    "\0"
-   /* _mesa_function_pool[21950]: Hint (offset 158) */
+   /* _mesa_function_pool[22309]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[21961]: MemoryBarrier (will be remapped) */
+   /* _mesa_function_pool[22320]: MemoryBarrier (will be remapped) */
    "i\0"
    "glMemoryBarrier\0"
    "\0"
-   /* _mesa_function_pool[21980]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[22339]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[22030]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[22389]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[22048]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[22407]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[22079]: GetTexEnvxv (will be remapped) */
+   /* _mesa_function_pool[22438]: GetTexEnvxv (will be remapped) */
    "iip\0"
    "glGetTexEnvxvOES\0"
    "glGetTexEnvxv\0"
    "\0"
-   /* _mesa_function_pool[22115]: DrawTexsvOES (will be remapped) */
+   /* _mesa_function_pool[22474]: DrawTexsvOES (will be remapped) */
    "p\0"
    "glDrawTexsvOES\0"
    "\0"
-   /* _mesa_function_pool[22133]: Disable (offset 214) */
+   /* _mesa_function_pool[22492]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[22146]: ClearColor (offset 206) */
+   /* _mesa_function_pool[22505]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[22165]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[22524]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[22184]: GetTextureParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[22543]: GetTextureParameterIuiv (will be remapped) */
    "iip\0"
    "glGetTextureParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[22215]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[22574]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[22233]: VDPAUIsSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[22592]: VDPAUIsSurfaceNV (will be remapped) */
    "i\0"
    "glVDPAUIsSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[22255]: ProgramUniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[22614]: ProgramUniformMatrix2x3fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2x3fv\0"
    "glProgramUniformMatrix2x3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[22321]: BindVertexBuffer (will be remapped) */
+   /* _mesa_function_pool[22680]: BindVertexBuffer (will be remapped) */
    "iiii\0"
    "glBindVertexBuffer\0"
    "\0"
-   /* _mesa_function_pool[22346]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[22705]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[22367]: RasterPos4i (offset 82) */
+   /* _mesa_function_pool[22726]: RasterPos4i (offset 82) */
    "iiii\0"
    "glRasterPos4i\0"
    "\0"
-   /* _mesa_function_pool[22387]: RasterPos4d (offset 78) */
+   /* _mesa_function_pool[22746]: RasterPos4d (offset 78) */
    "dddd\0"
    "glRasterPos4d\0"
    "\0"
-   /* _mesa_function_pool[22407]: RasterPos4f (offset 80) */
+   /* _mesa_function_pool[22766]: RasterPos4f (offset 80) */
    "ffff\0"
    "glRasterPos4f\0"
    "\0"
-   /* _mesa_function_pool[22427]: GetQueryIndexediv (will be remapped) */
+   /* _mesa_function_pool[22786]: GetQueryIndexediv (will be remapped) */
    "iiip\0"
    "glGetQueryIndexediv\0"
    "\0"
-   /* _mesa_function_pool[22453]: RasterPos3dv (offset 71) */
+   /* _mesa_function_pool[22812]: RasterPos3dv (offset 71) */
    "p\0"
    "glRasterPos3dv\0"
    "\0"
-   /* _mesa_function_pool[22471]: GetProgramiv (will be remapped) */
+   /* _mesa_function_pool[22830]: GetProgramiv (will be remapped) */
    "iip\0"
    "glGetProgramiv\0"
    "\0"
-   /* _mesa_function_pool[22491]: TexCoord1iv (offset 99) */
+   /* _mesa_function_pool[22850]: TexCoord1iv (offset 99) */
    "p\0"
    "glTexCoord1iv\0"
    "\0"
-   /* _mesa_function_pool[22508]: RasterPos4s (offset 84) */
+   /* _mesa_function_pool[22867]: RasterPos4s (offset 84) */
    "iiii\0"
    "glRasterPos4s\0"
    "\0"
-   /* _mesa_function_pool[22528]: PixelTexGenParameterfvSGIS (dynamic) */
+   /* _mesa_function_pool[22887]: PixelTexGenParameterfvSGIS (dynamic) */
    "ip\0"
    "glPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[22561]: VertexAttrib3dv (will be remapped) */
+   /* _mesa_function_pool[22920]: VertexAttrib3dv (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[22604]: Histogram (offset 367) */
+   /* _mesa_function_pool[22963]: Histogram (offset 367) */
    "iiii\0"
    "glHistogram\0"
    "glHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[22637]: Uniform2fv (will be remapped) */
+   /* _mesa_function_pool[22996]: Uniform2fv (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[22671]: TexImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[23030]: TexImage4DSGIS (dynamic) */
    "iiiiiiiiiip\0"
    "glTexImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[22701]: ProgramUniformMatrix3x4dv (will be remapped) */
+   /* _mesa_function_pool[23060]: ProgramUniformMatrix3x4dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3x4dv\0"
    "\0"
-   /* _mesa_function_pool[22736]: DrawBuffers (will be remapped) */
+   /* _mesa_function_pool[23095]: DrawBuffers (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
@@ -3119,3257 +3171,3269 @@ static const char _mesa_function_pool[] =
    "glDrawBuffersNV\0"
    "glDrawBuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[22821]: GetnPolygonStippleARB (will be remapped) */
+   /* _mesa_function_pool[23180]: GetnPolygonStippleARB (will be remapped) */
    "ip\0"
    "glGetnPolygonStippleARB\0"
    "\0"
-   /* _mesa_function_pool[22849]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[23208]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[22864]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[23223]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[22882]: TextureStorage3DEXT (will be remapped) */
+   /* _mesa_function_pool[23241]: TextureStorage3DEXT (will be remapped) */
    "iiiiiii\0"
    "glTextureStorage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[22913]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[23272]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[22955]: WindowPos2fv (will be remapped) */
+   /* _mesa_function_pool[23314]: WindowPos2fv (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[23010]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[23369]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[23030]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[23389]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "glTexImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[23087]: GetPerfQueryIdByNameINTEL (will be remapped) */
+   /* _mesa_function_pool[23446]: GetPerfQueryIdByNameINTEL (will be remapped) */
    "pp\0"
    "glGetPerfQueryIdByNameINTEL\0"
    "\0"
-   /* _mesa_function_pool[23119]: BindFragDataLocation (will be remapped) */
+   /* _mesa_function_pool[23478]: BindFragDataLocation (will be remapped) */
    "iip\0"
    "glBindFragDataLocationEXT\0"
    "glBindFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[23173]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[23532]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[23192]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[23551]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[23207]: BeginQueryIndexed (will be remapped) */
+   /* _mesa_function_pool[23566]: BeginQueryIndexed (will be remapped) */
    "iii\0"
    "glBeginQueryIndexed\0"
    "\0"
-   /* _mesa_function_pool[23232]: ProgramUniform3dv (will be remapped) */
-   "iiip\0"
-   "glProgramUniform3dv\0"
+   /* _mesa_function_pool[23591]: ClearNamedBufferData (will be remapped) */
+   "iiiip\0"
+   "glClearNamedBufferData\0"
    "\0"
-   /* _mesa_function_pool[23258]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[23621]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[23273]: UniformMatrix2x3dv (will be remapped) */
+   /* _mesa_function_pool[23636]: UniformMatrix2x3dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3dv\0"
    "\0"
-   /* _mesa_function_pool[23300]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[23663]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[23317]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[23680]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[23344]: VertexP3ui (will be remapped) */
+   /* _mesa_function_pool[23707]: VertexP3ui (will be remapped) */
    "ii\0"
    "glVertexP3ui\0"
    "\0"
-   /* _mesa_function_pool[23361]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[23724]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[23388]: UniformMatrix3fv (will be remapped) */
+   /* _mesa_function_pool[23751]: UniformMatrix3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3fv\0"
    "glUniformMatrix3fvARB\0"
    "\0"
-   /* _mesa_function_pool[23435]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[23798]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[23485]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[23848]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
    "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[23532]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[23895]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[23553]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[23916]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[23590]: GetMaterialxv (will be remapped) */
+   /* _mesa_function_pool[23953]: GetMaterialxv (will be remapped) */
    "iip\0"
    "glGetMaterialxvOES\0"
    "glGetMaterialxv\0"
    "\0"
-   /* _mesa_function_pool[23630]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[23993]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[23654]: SecondaryColor3uiv (will be remapped) */
+   /* _mesa_function_pool[24017]: SecondaryColor3uiv (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[23702]: EndConditionalRender (will be remapped) */
+   /* _mesa_function_pool[24065]: EndConditionalRender (will be remapped) */
    "\0"
    "glEndConditionalRender\0"
    "glEndConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[23752]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[24115]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[23789]: Color3sv (offset 18) */
+   /* _mesa_function_pool[24152]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[23803]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[24166]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[23830]: BlendEquationSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[24193]: GetNamedBufferParameteriv (will be remapped) */
+   "iip\0"
+   "glGetNamedBufferParameteriv\0"
+   "\0"
+   /* _mesa_function_pool[24226]: BlendEquationSeparateiARB (will be remapped) */
    "iii\0"
    "glBlendEquationSeparateiARB\0"
    "glBlendEquationSeparateIndexedAMD\0"
    "glBlendEquationSeparatei\0"
    "\0"
-   /* _mesa_function_pool[23922]: TestFenceNV (dynamic) */
+   /* _mesa_function_pool[24318]: TestFenceNV (dynamic) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[23939]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[24335]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[23984]: TexStorage2D (will be remapped) */
+   /* _mesa_function_pool[24380]: TexStorage2D (will be remapped) */
    "iiiii\0"
    "glTexStorage2D\0"
    "\0"
-   /* _mesa_function_pool[24006]: GetPixelTexGenParameterivSGIS (dynamic) */
+   /* _mesa_function_pool[24402]: GetPixelTexGenParameterivSGIS (dynamic) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[24042]: FramebufferTexture2D (will be remapped) */
+   /* _mesa_function_pool[24438]: FramebufferTexture2D (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "glFramebufferTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[24124]: GetSamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[24520]: GetSamplerParameterfv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[24153]: VertexAttrib2dv (will be remapped) */
+   /* _mesa_function_pool[24549]: VertexAttrib2dv (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[24196]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[24592]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[24211]: GetQueryObjecti64v (will be remapped) */
+   /* _mesa_function_pool[24607]: GetQueryObjecti64v (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64v\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[24261]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[24657]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColorARB\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[24294]: TextureRangeAPPLE (dynamic) */
+   /* _mesa_function_pool[24690]: TextureRangeAPPLE (dynamic) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[24319]: ConvolutionFilter1D (offset 348) */
+   /* _mesa_function_pool[24715]: ConvolutionFilter1D (offset 348) */
    "iiiiip\0"
    "glConvolutionFilter1D\0"
    "glConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[24374]: DrawElementsIndirect (will be remapped) */
+   /* _mesa_function_pool[24770]: DrawElementsIndirect (will be remapped) */
    "iip\0"
    "glDrawElementsIndirect\0"
    "\0"
-   /* _mesa_function_pool[24402]: WindowPos3sv (will be remapped) */
+   /* _mesa_function_pool[24798]: WindowPos3sv (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[24457]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[24853]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[24487]: CallLists (offset 3) */
+   /* _mesa_function_pool[24883]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[24504]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[24900]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[24520]: GetTextureParameterfv (will be remapped) */
+   /* _mesa_function_pool[24916]: GetTextureParameterfv (will be remapped) */
    "iip\0"
    "glGetTextureParameterfv\0"
    "\0"
-   /* _mesa_function_pool[24549]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[24945]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[24563]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[24959]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[24601]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[24997]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[24616]: DepthRangex (will be remapped) */
+   /* _mesa_function_pool[25012]: DepthRangex (will be remapped) */
    "ii\0"
    "glDepthRangexOES\0"
    "glDepthRangex\0"
    "\0"
-   /* _mesa_function_pool[24651]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[25047]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[24678]: VDPAUInitNV (will be remapped) */
+   /* _mesa_function_pool[25074]: VDPAUInitNV (will be remapped) */
    "pp\0"
    "glVDPAUInitNV\0"
    "\0"
-   /* _mesa_function_pool[24696]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[25092]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[24726]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[25122]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[24762]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[25158]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "glDepthRangefOES\0"
    "\0"
-   /* _mesa_function_pool[24797]: TextureParameteriv (will be remapped) */
+   /* _mesa_function_pool[25193]: TextureParameteriv (will be remapped) */
    "iip\0"
    "glTextureParameteriv\0"
    "\0"
-   /* _mesa_function_pool[24823]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[25219]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[24860]: ValidateProgram (will be remapped) */
+   /* _mesa_function_pool[25256]: ValidateProgram (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[24902]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[25298]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[24928]: Scissor (offset 176) */
+   /* _mesa_function_pool[25324]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[24944]: BeginTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[25340]: BeginTransformFeedback (will be remapped) */
    "i\0"
    "glBeginTransformFeedback\0"
    "glBeginTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[25000]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[25396]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[25017]: Color4ui (offset 37) */
+   /* _mesa_function_pool[25413]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[25034]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[25430]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[25051]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[25447]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[25068]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[25464]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[25085]: PointSizePointerOES (will be remapped) */
+   /* _mesa_function_pool[25481]: PointSizePointerOES (will be remapped) */
    "iip\0"
    "glPointSizePointerOES\0"
    "\0"
-   /* _mesa_function_pool[25112]: Color4us (offset 39) */
+   /* _mesa_function_pool[25508]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[25129]: Color3bv (offset 10) */
+   /* _mesa_function_pool[25525]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[25143]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[25539]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[25166]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[25562]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[25194]: ProvokingVertex (will be remapped) */
+   /* _mesa_function_pool[25590]: ProvokingVertex (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[25236]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[25632]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[25262]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[25658]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[25294]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[25690]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[25309]: HintPGI (dynamic) */
+   /* _mesa_function_pool[25705]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[25323]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[25719]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[25348]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[25744]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[25366]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[25762]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[25383]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[25779]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[25404]: MultiTexCoord4dv (offset 401) */
+   /* _mesa_function_pool[25800]: MultiTexCoord4dv (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[25449]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[25845]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[25506]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[25902]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[25524]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[25920]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[25554]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[25950]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[25569]: EndList (offset 1) */
+   /* _mesa_function_pool[25965]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[25581]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[25977]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[25632]: GetTexGenxvOES (will be remapped) */
+   /* _mesa_function_pool[26028]: GetTexGenxvOES (will be remapped) */
    "iip\0"
    "glGetTexGenxvOES\0"
    "\0"
-   /* _mesa_function_pool[25654]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[26050]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[25680]: DrawTexfvOES (will be remapped) */
+   /* _mesa_function_pool[26076]: DrawTexfvOES (will be remapped) */
    "p\0"
    "glDrawTexfvOES\0"
    "\0"
-   /* _mesa_function_pool[25698]: BlendFunciARB (will be remapped) */
+   /* _mesa_function_pool[26094]: BlendFunciARB (will be remapped) */
    "iii\0"
    "glBlendFunciARB\0"
    "glBlendFuncIndexedAMD\0"
    "glBlendFunci\0"
    "\0"
-   /* _mesa_function_pool[25754]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[26150]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[25781]: Uniform2ui (will be remapped) */
+   /* _mesa_function_pool[26177]: Uniform2ui (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[25815]: ScissorIndexed (will be remapped) */
+   /* _mesa_function_pool[26211]: ScissorIndexed (will be remapped) */
    "iiiii\0"
    "glScissorIndexed\0"
    "\0"
-   /* _mesa_function_pool[25839]: End (offset 43) */
+   /* _mesa_function_pool[26235]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[25847]: BindVertexBuffers (will be remapped) */
+   /* _mesa_function_pool[26243]: BindVertexBuffers (will be remapped) */
    "iippp\0"
    "glBindVertexBuffers\0"
    "\0"
-   /* _mesa_function_pool[25874]: GetSamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[26270]: GetSamplerParameteriv (will be remapped) */
    "iip\0"
    "glGetSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[25903]: GenProgramPipelines (will be remapped) */
+   /* _mesa_function_pool[26299]: GenProgramPipelines (will be remapped) */
    "ip\0"
    "glGenProgramPipelines\0"
    "glGenProgramPipelinesEXT\0"
    "\0"
-   /* _mesa_function_pool[25954]: Enable (offset 215) */
+   /* _mesa_function_pool[26350]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[25966]: IsProgramPipeline (will be remapped) */
+   /* _mesa_function_pool[26362]: IsProgramPipeline (will be remapped) */
    "i\0"
    "glIsProgramPipeline\0"
    "glIsProgramPipelineEXT\0"
    "\0"
-   /* _mesa_function_pool[26012]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[26408]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[26034]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[26430]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[26067]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[26463]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "glWeightPointerOES\0"
    "\0"
-   /* _mesa_function_pool[26111]: TextureSubImage1D (will be remapped) */
+   /* _mesa_function_pool[26507]: TextureSubImage1D (will be remapped) */
    "iiiiiip\0"
    "glTextureSubImage1D\0"
    "\0"
-   /* _mesa_function_pool[26140]: Normal3x (will be remapped) */
+   /* _mesa_function_pool[26536]: Normal3x (will be remapped) */
    "iii\0"
    "glNormal3xOES\0"
    "glNormal3x\0"
    "\0"
-   /* _mesa_function_pool[26170]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[26566]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[26214]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[26610]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[26231]: ReadnPixelsARB (will be remapped) */
+   /* _mesa_function_pool[26627]: ReadnPixelsARB (will be remapped) */
    "iiiiiiip\0"
    "glReadnPixelsARB\0"
    "\0"
-   /* _mesa_function_pool[26258]: InvalidateTexSubImage (will be remapped) */
+   /* _mesa_function_pool[26654]: InvalidateTexSubImage (will be remapped) */
    "iiiiiiii\0"
    "glInvalidateTexSubImage\0"
    "\0"
-   /* _mesa_function_pool[26292]: Normal3s (offset 60) */
+   /* _mesa_function_pool[26688]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[26308]: Materialxv (will be remapped) */
+   /* _mesa_function_pool[26704]: Materialxv (will be remapped) */
    "iip\0"
    "glMaterialxvOES\0"
    "glMaterialxv\0"
    "\0"
-   /* _mesa_function_pool[26342]: Normal3i (offset 58) */
+   /* _mesa_function_pool[26738]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[26358]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[26754]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[26393]: Normal3b (offset 52) */
+   /* _mesa_function_pool[26789]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[26409]: Normal3d (offset 54) */
+   /* _mesa_function_pool[26805]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[26425]: Normal3f (offset 56) */
+   /* _mesa_function_pool[26821]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[26441]: Indexi (offset 48) */
+   /* _mesa_function_pool[26837]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[26453]: Uniform1uiv (will be remapped) */
+   /* _mesa_function_pool[26849]: Uniform1uiv (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[26489]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[26885]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[26535]: IsRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[26931]: IsRenderbuffer (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "glIsRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[26595]: NormalP3uiv (will be remapped) */
+   /* _mesa_function_pool[26991]: NormalP3uiv (will be remapped) */
    "ip\0"
    "glNormalP3uiv\0"
    "\0"
-   /* _mesa_function_pool[26613]: Indexf (offset 46) */
+   /* _mesa_function_pool[27009]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[26625]: Indexd (offset 44) */
+   /* _mesa_function_pool[27021]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[26637]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[27033]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[26658]: Indexs (offset 50) */
+   /* _mesa_function_pool[27054]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[26670]: MultiTexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[27066]: MultiTexCoordP1uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[26696]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[27092]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[26752]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[27148]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[26767]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[27163]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[26782]: Color4bv (offset 26) */
+   /* _mesa_function_pool[27178]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[26796]: ProgramUniformMatrix3x2dv (will be remapped) */
+   /* _mesa_function_pool[27192]: ProgramUniformMatrix3x2dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3x2dv\0"
    "\0"
-   /* _mesa_function_pool[26831]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[27227]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[26855]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[27251]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[26870]: ActiveTexture (offset 374) */
+   /* _mesa_function_pool[27266]: ActiveTexture (offset 374) */
    "i\0"
    "glActiveTexture\0"
    "glActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[26908]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[27304]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[26935]: ColorP4uiv (will be remapped) */
+   /* _mesa_function_pool[27331]: ColorP4uiv (will be remapped) */
    "ip\0"
    "glColorP4uiv\0"
    "\0"
-   /* _mesa_function_pool[26952]: DrawTexxOES (will be remapped) */
+   /* _mesa_function_pool[27348]: DrawTexxOES (will be remapped) */
    "iiiii\0"
    "glDrawTexxOES\0"
    "\0"
-   /* _mesa_function_pool[26973]: SetFenceNV (dynamic) */
+   /* _mesa_function_pool[27369]: SetFenceNV (dynamic) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[26990]: PixelTexGenParameterivSGIS (dynamic) */
+   /* _mesa_function_pool[27386]: PixelTexGenParameterivSGIS (dynamic) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[27023]: MultiTexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[27419]: MultiTexCoordP3ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[27048]: GetAttribLocation (will be remapped) */
+   /* _mesa_function_pool[27444]: GetAttribLocation (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[27095]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[27491]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[27132]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[27528]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[27148]: MultiTexCoord2dv (offset 385) */
+   /* _mesa_function_pool[27544]: MultiTexCoord2dv (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[27193]: IsSampler (will be remapped) */
+   /* _mesa_function_pool[27589]: IsSampler (will be remapped) */
    "i\0"
    "glIsSampler\0"
    "\0"
-   /* _mesa_function_pool[27208]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[27604]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[27224]: LineStipple (offset 167) */
-   "ii\0"
-   "glLineStipple\0"
-   "\0"
-   /* _mesa_function_pool[27242]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[27620]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[27261]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[27639]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[27281]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[27659]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[27299]: TexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[27677]: TexCoordP2ui (will be remapped) */
    "ii\0"
    "glTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[27318]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[27696]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[27340]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[27718]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[27383]: ProgramUniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[27761]: ProgramUniformMatrix3x4fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3x4fv\0"
    "glProgramUniformMatrix3x4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[27449]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[27827]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[27484]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[27862]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[27513]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[27891]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[27573]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[27951]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[27591]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[27969]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[27635]: Frustum (offset 289) */
+   /* _mesa_function_pool[28013]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[27653]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[28031]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[27671]: GetTextureParameteriv (will be remapped) */
+   /* _mesa_function_pool[28049]: GetTextureParameteriv (will be remapped) */
    "iip\0"
    "glGetTextureParameteriv\0"
    "\0"
-   /* _mesa_function_pool[27700]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[28078]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[27718]: DepthRangeArrayv (will be remapped) */
+   /* _mesa_function_pool[28096]: DepthRangeArrayv (will be remapped) */
    "iip\0"
    "glDepthRangeArrayv\0"
    "\0"
-   /* _mesa_function_pool[27742]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[28120]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[27783]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[28161]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[27811]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[28189]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[27829]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[28207]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[27863]: TextureParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[28241]: TextureParameterIuiv (will be remapped) */
    "iip\0"
    "glTextureParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[27891]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[28269]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[27925]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[28303]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[27944]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[28322]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[27960]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[28338]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[27977]: TexStorage3D (will be remapped) */
+   /* _mesa_function_pool[28355]: TexStorage3D (will be remapped) */
    "iiiiii\0"
    "glTexStorage3D\0"
    "\0"
-   /* _mesa_function_pool[28000]: FramebufferTexture3D (will be remapped) */
+   /* _mesa_function_pool[28378]: FramebufferTexture3D (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "glFramebufferTexture3DOES\0"
    "\0"
-   /* _mesa_function_pool[28083]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[28461]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[28114]: GetBufferParameteriv (will be remapped) */
+   /* _mesa_function_pool[28492]: GetBufferParameteriv (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[28168]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[28546]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[28192]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[28570]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[28222]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[28600]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[28269]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[28647]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[28284]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[28662]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[28306]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[28684]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[28335]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[28713]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[28361]: IsQuery (will be remapped) */
+   /* _mesa_function_pool[28739]: IsQuery (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[28387]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[28765]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[28413]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[28791]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[28439]: CreateShaderProgramv (will be remapped) */
+   /* _mesa_function_pool[28817]: CreateShaderProgramv (will be remapped) */
    "iip\0"
    "glCreateShaderProgramv\0"
    "glCreateShaderProgramvEXT\0"
    "\0"
-   /* _mesa_function_pool[28493]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[28871]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "glBlendEquationIndexedAMD\0"
    "glBlendEquationi\0"
    "\0"
-   /* _mesa_function_pool[28560]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[28938]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[28607]: PointSizex (will be remapped) */
+   /* _mesa_function_pool[28985]: PointSizex (will be remapped) */
    "i\0"
    "glPointSizexOES\0"
    "glPointSizex\0"
    "\0"
-   /* _mesa_function_pool[28639]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[29017]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[28657]: SecondaryColor3iv (will be remapped) */
+   /* _mesa_function_pool[29035]: SecondaryColor3iv (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[28703]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[29081]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[28746]: VertexAttrib4Niv (will be remapped) */
+   /* _mesa_function_pool[29124]: VertexAttrib4Niv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[28791]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[29169]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[28825]: GetnUniformdvARB (will be remapped) */
+   /* _mesa_function_pool[29203]: GetnUniformdvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformdvARB\0"
    "\0"
-   /* _mesa_function_pool[28850]: LinkProgram (will be remapped) */
+   /* _mesa_function_pool[29228]: LinkProgram (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[28884]: ProgramUniform4d (will be remapped) */
+   /* _mesa_function_pool[29262]: ProgramUniform4d (will be remapped) */
    "iidddd\0"
    "glProgramUniform4d\0"
    "\0"
-   /* _mesa_function_pool[28911]: ProgramUniform4f (will be remapped) */
+   /* _mesa_function_pool[29289]: ProgramUniform4f (will be remapped) */
    "iiffff\0"
    "glProgramUniform4f\0"
    "glProgramUniform4fEXT\0"
    "\0"
-   /* _mesa_function_pool[28960]: ProgramUniform4i (will be remapped) */
+   /* _mesa_function_pool[29338]: ProgramUniform4i (will be remapped) */
    "iiiiii\0"
    "glProgramUniform4i\0"
    "glProgramUniform4iEXT\0"
    "\0"
-   /* _mesa_function_pool[29009]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[29387]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[29036]: VertexAttrib4d (will be remapped) */
+   /* _mesa_function_pool[29414]: GetNamedBufferPointerv (will be remapped) */
+   "iip\0"
+   "glGetNamedBufferPointerv\0"
+   "\0"
+   /* _mesa_function_pool[29444]: VertexAttrib4d (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[29080]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[29488]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[29104]: VertexAttrib4s (will be remapped) */
+   /* _mesa_function_pool[29512]: VertexAttrib4s (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[29148]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[29556]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[29172]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[29580]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[29205]: TexStorage3DMultisample (will be remapped) */
+   /* _mesa_function_pool[29613]: TexStorage3DMultisample (will be remapped) */
    "iiiiiii\0"
    "glTexStorage3DMultisample\0"
    "\0"
-   /* _mesa_function_pool[29240]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[29648]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[29260]: SamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[29668]: SamplerParameteriv (will be remapped) */
    "iip\0"
    "glSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[29286]: VertexAttribP3uiv (will be remapped) */
+   /* _mesa_function_pool[29694]: VertexAttribP3uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP3uiv\0"
    "\0"
-   /* _mesa_function_pool[29312]: ScissorIndexedv (will be remapped) */
+   /* _mesa_function_pool[29720]: ScissorIndexedv (will be remapped) */
    "ip\0"
    "glScissorIndexedv\0"
    "\0"
-   /* _mesa_function_pool[29334]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[29742]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[29364]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[29772]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[29396]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[29804]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[29413]: Uniform2dv (will be remapped) */
+   /* _mesa_function_pool[29821]: Uniform2dv (will be remapped) */
    "iip\0"
    "glUniform2dv\0"
    "\0"
-   /* _mesa_function_pool[29431]: VertexAttrib4dv (will be remapped) */
+   /* _mesa_function_pool[29839]: VertexAttrib4dv (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[29474]: CreateTextures (will be remapped) */
+   /* _mesa_function_pool[29882]: CreateTextures (will be remapped) */
    "iip\0"
    "glCreateTextures\0"
    "\0"
-   /* _mesa_function_pool[29496]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[29904]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[29514]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[29922]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[29537]: CompressedTexSubImage1D (will be remapped) */
+   /* _mesa_function_pool[29945]: CompressedTexSubImage1D (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[29601]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[30009]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[29654]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[30062]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[29680]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[30088]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[29702]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[30110]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[29720]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[30128]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[29743]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[30151]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[29793]: GetnSeparableFilterARB (will be remapped) */
+   /* _mesa_function_pool[30201]: GetnSeparableFilterARB (will be remapped) */
    "iiiipipp\0"
    "glGetnSeparableFilterARB\0"
    "\0"
-   /* _mesa_function_pool[29828]: FrontFace (offset 157) */
+   /* _mesa_function_pool[30236]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[29843]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[30251]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[29875]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[30283]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[29894]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[30302]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[29914]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[30322]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[29929]: Lightf (offset 159) */
+   /* _mesa_function_pool[30337]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[29943]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[30351]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[29959]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[30367]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[29980]: Lighti (offset 161) */
+   /* _mesa_function_pool[30388]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[29994]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[30402]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[30025]: GetFragDataIndex (will be remapped) */
+   /* _mesa_function_pool[30433]: GetFragDataIndex (will be remapped) */
    "ip\0"
    "glGetFragDataIndex\0"
    "\0"
-   /* _mesa_function_pool[30048]: Lightx (will be remapped) */
+   /* _mesa_function_pool[30456]: Lightx (will be remapped) */
    "iii\0"
    "glLightxOES\0"
    "glLightx\0"
    "\0"
-   /* _mesa_function_pool[30074]: ProgramUniform3fv (will be remapped) */
+   /* _mesa_function_pool[30482]: ProgramUniform3fv (will be remapped) */
    "iiip\0"
    "glProgramUniform3fv\0"
    "glProgramUniform3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[30123]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[30531]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[30140]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[30548]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[30157]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[30565]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[30202]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[30610]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[30229]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[30637]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[30251]: SamplerParameterf (will be remapped) */
+   /* _mesa_function_pool[30659]: SamplerParameterf (will be remapped) */
    "iif\0"
    "glSamplerParameterf\0"
    "\0"
-   /* _mesa_function_pool[30276]: UniformMatrix3dv (will be remapped) */
+   /* _mesa_function_pool[30684]: UniformMatrix3dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3dv\0"
    "\0"
-   /* _mesa_function_pool[30301]: PointParameterx (will be remapped) */
+   /* _mesa_function_pool[30709]: PointParameterx (will be remapped) */
    "ii\0"
    "glPointParameterxOES\0"
    "glPointParameterx\0"
    "\0"
-   /* _mesa_function_pool[30344]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[30752]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[30378]: Uniform3dv (will be remapped) */
+   /* _mesa_function_pool[30786]: Uniform3dv (will be remapped) */
    "iip\0"
    "glUniform3dv\0"
    "\0"
-   /* _mesa_function_pool[30396]: PointParameteri (will be remapped) */
+   /* _mesa_function_pool[30804]: PointParameteri (will be remapped) */
    "ii\0"
    "glPointParameteri\0"
    "glPointParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[30438]: PointParameterf (will be remapped) */
+   /* _mesa_function_pool[30846]: PointParameterf (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[30524]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[30932]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[30551]: VertexAttribBinding (will be remapped) */
+   /* _mesa_function_pool[30959]: VertexAttribBinding (will be remapped) */
    "ii\0"
    "glVertexAttribBinding\0"
    "\0"
-   /* _mesa_function_pool[30577]: TextureSubImage2D (will be remapped) */
+   /* _mesa_function_pool[30985]: TextureSubImage2D (will be remapped) */
    "iiiiiiiip\0"
    "glTextureSubImage2D\0"
    "\0"
-   /* _mesa_function_pool[30608]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[31016]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[30655]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[31063]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[30673]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[31081]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[30705]: ProgramUniform1dv (will be remapped) */
+   /* _mesa_function_pool[31113]: ProgramUniform1dv (will be remapped) */
    "iiip\0"
    "glProgramUniform1dv\0"
    "\0"
-   /* _mesa_function_pool[30731]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[31139]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[30766]: DeleteBuffers (will be remapped) */
+   /* _mesa_function_pool[31174]: DeleteBuffers (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[30805]: GetBufferSubData (will be remapped) */
+   /* _mesa_function_pool[31213]: GetBufferSubData (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[30852]: GetPerfMonitorGroupsAMD (will be remapped) */
+   /* _mesa_function_pool[31260]: GetPerfMonitorGroupsAMD (will be remapped) */
    "pip\0"
    "glGetPerfMonitorGroupsAMD\0"
    "\0"
-   /* _mesa_function_pool[30883]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[31291]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[30903]: VertexAttribP2ui (will be remapped) */
+   /* _mesa_function_pool[31311]: VertexAttribP2ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP2ui\0"
    "\0"
-   /* _mesa_function_pool[30928]: ProgramUniform4dv (will be remapped) */
+   /* _mesa_function_pool[31336]: ProgramUniform4dv (will be remapped) */
    "iiip\0"
    "glProgramUniform4dv\0"
    "\0"
-   /* _mesa_function_pool[30954]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[31362]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[31008]: DrawTexivOES (will be remapped) */
+   /* _mesa_function_pool[31416]: DrawTexivOES (will be remapped) */
    "p\0"
    "glDrawTexivOES\0"
    "\0"
-   /* _mesa_function_pool[31026]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[31434]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[31072]: GetnColorTableARB (will be remapped) */
+   /* _mesa_function_pool[31480]: GetnColorTableARB (will be remapped) */
    "iiiip\0"
    "glGetnColorTableARB\0"
    "\0"
-   /* _mesa_function_pool[31099]: VertexAttribFormat (will be remapped) */
+   /* _mesa_function_pool[31507]: VertexAttribFormat (will be remapped) */
    "iiiii\0"
    "glVertexAttribFormat\0"
    "\0"
-   /* _mesa_function_pool[31127]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[31535]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[31143]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[31551]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[31159]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[31567]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[31175]: GetProgramPipelineiv (will be remapped) */
+   /* _mesa_function_pool[31583]: GetProgramPipelineiv (will be remapped) */
    "iip\0"
    "glGetProgramPipelineiv\0"
    "glGetProgramPipelineivEXT\0"
    "\0"
-   /* _mesa_function_pool[31229]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[31637]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "glReadBufferNV\0"
    "\0"
-   /* _mesa_function_pool[31260]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[31668]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[31316]: GetTexParameterIiv (will be remapped) */
+   /* _mesa_function_pool[31724]: GetTexParameterIiv (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[31366]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[31774]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[31382]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[31790]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[31438]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[31846]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[31530]: GetTransformFeedbackVarying (will be remapped) */
+   /* _mesa_function_pool[31938]: GetTransformFeedbackVarying (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVarying\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "\0"
-   /* _mesa_function_pool[31602]: GetNextPerfQueryIdINTEL (will be remapped) */
+   /* _mesa_function_pool[32010]: GetNextPerfQueryIdINTEL (will be remapped) */
    "ip\0"
    "glGetNextPerfQueryIdINTEL\0"
    "\0"
-   /* _mesa_function_pool[31632]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[32040]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[31649]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[32057]: TextureBarrierNV (will be remapped) */
    "\0"
    "glTextureBarrier\0"
    "glTextureBarrierNV\0"
    "\0"
-   /* _mesa_function_pool[31687]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[32095]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[31746]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[32154]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[31783]: ObjectLabel (will be remapped) */
+   /* _mesa_function_pool[32191]: ObjectLabel (will be remapped) */
    "iiip\0"
    "glObjectLabel\0"
    "\0"
-   /* _mesa_function_pool[31803]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[32211]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[31830]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[32238]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[31848]: CompileShader (will be remapped) */
+   /* _mesa_function_pool[32256]: CompileShader (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[31886]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[32294]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[31901]: TexGendv (offset 189) */
+   /* _mesa_function_pool[32309]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[31917]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[32325]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[31954]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[32362]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[31988]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[32396]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[32015]: GenerateTextureMipmap (will be remapped) */
+   /* _mesa_function_pool[32423]: GenerateTextureMipmap (will be remapped) */
    "i\0"
    "glGenerateTextureMipmap\0"
    "\0"
-   /* _mesa_function_pool[32042]: DeleteProgramsARB (will be remapped) */
+   /* _mesa_function_pool[32450]: DeleteProgramsARB (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[32085]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[32493]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[32101]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[32509]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[32127]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[32535]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[32145]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[32553]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[32176]: MultiDrawArrays (will be remapped) */
+   /* _mesa_function_pool[32584]: MultiDrawArrays (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[32221]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[32629]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[32258]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[32666]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[32287]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[32695]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "glMapBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[32330]: DispatchCompute (will be remapped) */
+   /* _mesa_function_pool[32738]: DispatchCompute (will be remapped) */
    "iii\0"
    "glDispatchCompute\0"
    "\0"
-   /* _mesa_function_pool[32353]: UseProgramStages (will be remapped) */
+   /* _mesa_function_pool[32761]: UseProgramStages (will be remapped) */
    "iii\0"
    "glUseProgramStages\0"
    "glUseProgramStagesEXT\0"
    "\0"
-   /* _mesa_function_pool[32399]: ProgramUniformMatrix4fv (will be remapped) */
+   /* _mesa_function_pool[32807]: ProgramUniformMatrix4fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4fv\0"
    "glProgramUniformMatrix4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[32461]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[32869]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[32482]: FramebufferRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[32890]: FramebufferRenderbuffer (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "glFramebufferRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[32572]: IsProgramARB (will be remapped) */
+   /* _mesa_function_pool[32980]: IsProgramARB (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[32604]: Map2d (offset 222) */
+   /* _mesa_function_pool[33012]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[32624]: Map2f (offset 223) */
+   /* _mesa_function_pool[33032]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[32644]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[33052]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[32669]: CopyTextureSubImage2D (will be remapped) */
+   /* _mesa_function_pool[33077]: CopyTextureSubImage2D (will be remapped) */
    "iiiiiiii\0"
    "glCopyTextureSubImage2D\0"
    "\0"
-   /* _mesa_function_pool[32703]: MultiTexCoord4s (offset 406) */
+   /* _mesa_function_pool[33111]: MultiTexCoord4s (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[32749]: ViewportIndexedf (will be remapped) */
+   /* _mesa_function_pool[33157]: ViewportIndexedf (will be remapped) */
    "iffff\0"
    "glViewportIndexedf\0"
    "\0"
-   /* _mesa_function_pool[32775]: MultiTexCoord4i (offset 404) */
+   /* _mesa_function_pool[33183]: MultiTexCoord4i (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[32821]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[33229]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[32842]: DebugMessageControl (will be remapped) */
+   /* _mesa_function_pool[33250]: DebugMessageControl (will be remapped) */
    "iiiipi\0"
    "glDebugMessageControlARB\0"
    "glDebugMessageControl\0"
    "\0"
-   /* _mesa_function_pool[32897]: MultiTexCoord4d (offset 400) */
+   /* _mesa_function_pool[33305]: MultiTexCoord4d (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[32943]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[33351]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[32983]: Translatex (will be remapped) */
+   /* _mesa_function_pool[33391]: Translatex (will be remapped) */
    "iii\0"
    "glTranslatexOES\0"
    "glTranslatex\0"
    "\0"
-   /* _mesa_function_pool[33017]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[33425]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[33042]: Indexsv (offset 51) */
+   /* _mesa_function_pool[33450]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[33055]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[33463]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[33098]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[33506]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[33115]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[33523]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[33142]: Translated (offset 303) */
+   /* _mesa_function_pool[33550]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[33160]: Translatef (offset 304) */
+   /* _mesa_function_pool[33568]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[33178]: MultTransposeMatrixd (will be remapped) */
+   /* _mesa_function_pool[33586]: MultTransposeMatrixd (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[33230]: ProgramUniform4uiv (will be remapped) */
+   /* _mesa_function_pool[33638]: ProgramUniform4uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform4uiv\0"
    "glProgramUniform4uivEXT\0"
    "\0"
-   /* _mesa_function_pool[33281]: GetPerfCounterInfoINTEL (will be remapped) */
+   /* _mesa_function_pool[33689]: GetPerfCounterInfoINTEL (will be remapped) */
    "iiipipppppp\0"
    "glGetPerfCounterInfoINTEL\0"
    "\0"
-   /* _mesa_function_pool[33320]: RenderMode (offset 196) */
+   /* _mesa_function_pool[33728]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[33336]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[33744]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[33379]: SecondaryColor3d (will be remapped) */
+   /* _mesa_function_pool[33787]: SecondaryColor3d (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[33425]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[33833]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[33452]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[33860]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[33470]: ProgramUniform4fv (will be remapped) */
-   "iiip\0"
-   "glProgramUniform4fv\0"
-   "glProgramUniform4fvEXT\0"
-   "\0"
-   /* _mesa_function_pool[33519]: LightModelxv (will be remapped) */
+   /* _mesa_function_pool[33878]: LightModelxv (will be remapped) */
    "ip\0"
    "glLightModelxvOES\0"
    "glLightModelxv\0"
    "\0"
-   /* _mesa_function_pool[33556]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[33915]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[33607]: TextureSubImage3D (will be remapped) */
+   /* _mesa_function_pool[33966]: TextureSubImage3D (will be remapped) */
    "iiiiiiiiiip\0"
    "glTextureSubImage3D\0"
    "\0"
-   /* _mesa_function_pool[33640]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[33999]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[33659]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[34018]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[33679]: TexGenxvOES (will be remapped) */
+   /* _mesa_function_pool[34038]: TexGenxvOES (will be remapped) */
    "iip\0"
    "glTexGenxvOES\0"
    "\0"
-   /* _mesa_function_pool[33698]: GetTextureLevelParameterfv (will be remapped) */
+   /* _mesa_function_pool[34057]: GetTextureLevelParameterfv (will be remapped) */
    "iiip\0"
    "glGetTextureLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[33733]: VertexAttrib4Nubv (will be remapped) */
+   /* _mesa_function_pool[34092]: VertexAttrib4Nubv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[33780]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[34139]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[33800]: UniformMatrix4x2dv (will be remapped) */
+   /* _mesa_function_pool[34159]: UniformMatrix4x2dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2dv\0"
    "\0"
-   /* _mesa_function_pool[33827]: VertexAttribPointer (will be remapped) */
+   /* _mesa_function_pool[34186]: VertexAttribPointer (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[33882]: IndexMask (offset 212) */
+   /* _mesa_function_pool[34241]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[33897]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[34256]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[33923]: VertexAttribIFormat (will be remapped) */
+   /* _mesa_function_pool[34282]: VertexAttribIFormat (will be remapped) */
    "iiii\0"
    "glVertexAttribIFormat\0"
    "\0"
-   /* _mesa_function_pool[33951]: CombinerOutputNV (dynamic) */
+   /* _mesa_function_pool[34310]: CombinerOutputNV (dynamic) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[33982]: DrawArraysInstancedBaseInstance (will be remapped) */
+   /* _mesa_function_pool[34341]: DrawArraysInstancedBaseInstance (will be remapped) */
    "iiiii\0"
    "glDrawArraysInstancedBaseInstance\0"
    "\0"
-   /* _mesa_function_pool[34023]: CompressedTextureSubImage3D (will be remapped) */
+   /* _mesa_function_pool[34382]: CompressedTextureSubImage3D (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTextureSubImage3D\0"
    "\0"
-   /* _mesa_function_pool[34066]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[34425]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[34080]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[34439]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[34122]: Uniform3ui (will be remapped) */
+   /* _mesa_function_pool[34481]: Uniform3ui (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[34157]: DeletePerfMonitorsAMD (will be remapped) */
+   /* _mesa_function_pool[34516]: DeletePerfMonitorsAMD (will be remapped) */
    "ip\0"
    "glDeletePerfMonitorsAMD\0"
    "\0"
-   /* _mesa_function_pool[34185]: Color4dv (offset 28) */
+   /* _mesa_function_pool[34544]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[34199]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[34558]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[34228]: DisableVertexAttribArray (will be remapped) */
+   /* _mesa_function_pool[34587]: DisableVertexAttribArray (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[34288]: ProgramUniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[34647]: ProgramUniformMatrix3x2fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3x2fv\0"
    "glProgramUniformMatrix3x2fvEXT\0"
    "\0"
-   /* _mesa_function_pool[34354]: GetDoublei_v (will be remapped) */
+   /* _mesa_function_pool[34713]: GetDoublei_v (will be remapped) */
    "iip\0"
    "glGetDoublei_v\0"
    "\0"
-   /* _mesa_function_pool[34374]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[34733]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[34399]: ClipPlanex (will be remapped) */
+   /* _mesa_function_pool[34758]: ClipPlanex (will be remapped) */
    "ip\0"
    "glClipPlanexOES\0"
    "glClipPlanex\0"
    "\0"
-   /* _mesa_function_pool[34432]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[34791]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[34479]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[34838]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[34497]: ClipPlanef (will be remapped) */
+   /* _mesa_function_pool[34856]: ClipPlanef (will be remapped) */
    "ip\0"
    "glClipPlanefOES\0"
    "glClipPlanef\0"
    "\0"
-   /* _mesa_function_pool[34530]: ProgramUniform1ui (will be remapped) */
+   /* _mesa_function_pool[34889]: ProgramUniform1ui (will be remapped) */
    "iii\0"
    "glProgramUniform1ui\0"
    "glProgramUniform1uiEXT\0"
    "\0"
-   /* _mesa_function_pool[34578]: SecondaryColorPointer (will be remapped) */
+   /* _mesa_function_pool[34937]: SecondaryColorPointer (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[34635]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[34994]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[34654]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[35013]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[34674]: ClearBufferiv (will be remapped) */
-   "iip\0"
-   "glClearBufferiv\0"
+   /* _mesa_function_pool[35033]: LineStipple (offset 167) */
+   "ii\0"
+   "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[34695]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[35051]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[34721]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[35077]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[34748]: GenRenderbuffers (will be remapped) */
+   /* _mesa_function_pool[35104]: GenRenderbuffers (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "glGenRenderbuffersOES\0"
    "\0"
-   /* _mesa_function_pool[34815]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[35171]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[34869]: IsEnabledi (will be remapped) */
+   /* _mesa_function_pool[35225]: IsEnabledi (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[34908]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[35264]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[34938]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[35294]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[34954]: GetVertexAttribPointerv (will be remapped) */
+   /* _mesa_function_pool[35310]: GetVertexAttribPointerv (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[35042]: CreatePerfQueryINTEL (will be remapped) */
+   /* _mesa_function_pool[35398]: CreatePerfQueryINTEL (will be remapped) */
    "ip\0"
    "glCreatePerfQueryINTEL\0"
    "\0"
-   /* _mesa_function_pool[35069]: NewList (dynamic) */
+   /* _mesa_function_pool[35425]: NewList (dynamic) */
    "ii\0"
    "glNewList\0"
    "\0"
-   /* _mesa_function_pool[35083]: TexBuffer (will be remapped) */
+   /* _mesa_function_pool[35439]: TexBuffer (will be remapped) */
    "iii\0"
    "glTexBufferARB\0"
    "glTexBuffer\0"
    "\0"
-   /* _mesa_function_pool[35115]: TexCoord4sv (offset 125) */
+   /* _mesa_function_pool[35471]: TexCoord4sv (offset 125) */
    "p\0"
    "glTexCoord4sv\0"
    "\0"
-   /* _mesa_function_pool[35132]: TexCoord1f (offset 96) */
+   /* _mesa_function_pool[35488]: TexCoord1f (offset 96) */
    "f\0"
    "glTexCoord1f\0"
    "\0"
-   /* _mesa_function_pool[35148]: TexCoord1d (offset 94) */
+   /* _mesa_function_pool[35504]: TexCoord1d (offset 94) */
    "d\0"
    "glTexCoord1d\0"
    "\0"
-   /* _mesa_function_pool[35164]: TexCoord1i (offset 98) */
+   /* _mesa_function_pool[35520]: TexCoord1i (offset 98) */
    "i\0"
    "glTexCoord1i\0"
    "\0"
-   /* _mesa_function_pool[35180]: GetnUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[35536]: GetnUniformfvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[35205]: TexCoord1s (offset 100) */
+   /* _mesa_function_pool[35561]: TexCoord1s (offset 100) */
    "i\0"
    "glTexCoord1s\0"
    "\0"
-   /* _mesa_function_pool[35221]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[35577]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[35248]: TexStorage1D (will be remapped) */
+   /* _mesa_function_pool[35604]: Uniform1ui (will be remapped) */
+   "ii\0"
+   "glUniform1uiEXT\0"
+   "glUniform1ui\0"
+   "\0"
+   /* _mesa_function_pool[35637]: TexStorage1D (will be remapped) */
    "iiii\0"
    "glTexStorage1D\0"
    "\0"
-   /* _mesa_function_pool[35269]: BlitFramebuffer (will be remapped) */
+   /* _mesa_function_pool[35658]: BlitFramebuffer (will be remapped) */
    "iiiiiiiiii\0"
    "glBlitFramebuffer\0"
    "glBlitFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[35320]: TextureParameterf (will be remapped) */
+   /* _mesa_function_pool[35709]: TextureParameterf (will be remapped) */
    "iif\0"
    "glTextureParameterf\0"
    "\0"
-   /* _mesa_function_pool[35345]: FramebufferTexture1D (will be remapped) */
+   /* _mesa_function_pool[35734]: FramebufferTexture1D (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[35401]: TextureParameteri (will be remapped) */
+   /* _mesa_function_pool[35790]: TextureParameteri (will be remapped) */
    "iii\0"
    "glTextureParameteri\0"
    "\0"
-   /* _mesa_function_pool[35426]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[35815]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[35442]: TexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[35831]: TexCoordP4ui (will be remapped) */
    "ii\0"
    "glTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[35461]: VertexAttrib1sv (will be remapped) */
+   /* _mesa_function_pool[35850]: VertexAttrib1sv (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[35504]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[35893]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[35528]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[35917]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[35543]: MultiTexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[35932]: MultiTexCoordP2ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[35568]: GetnMapivARB (will be remapped) */
+   /* _mesa_function_pool[35957]: GetnMapivARB (will be remapped) */
    "iiip\0"
    "glGetnMapivARB\0"
    "\0"
-   /* _mesa_function_pool[35589]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[35978]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[35613]: GetVertexAttribfv (will be remapped) */
+   /* _mesa_function_pool[36002]: GetVertexAttribfv (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[35661]: MultiTexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[36050]: MultiTexCoordP4uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[35687]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[36076]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "glTexGenivOES\0"
    "\0"
-   /* _mesa_function_pool[35717]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[36106]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[35736]: BlendColor (offset 336) */
+   /* _mesa_function_pool[36125]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[35771]: Materiali (offset 171) */
+   /* _mesa_function_pool[36160]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[35788]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[36177]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[35812]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[36201]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[35852]: CompressedTexSubImage2D (will be remapped) */
+   /* _mesa_function_pool[36241]: CompressedTexSubImage2D (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[35918]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[36307]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[35935]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[36324]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[35961]: MultiTexCoord3sv (offset 399) */
+   /* _mesa_function_pool[36350]: MultiTexCoord3sv (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[36006]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[36395]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[36033]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[36422]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[36050]: MultiTexCoord4sv (offset 407) */
+   /* _mesa_function_pool[36439]: MultiTexCoord4sv (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[36095]: VertexBindingDivisor (will be remapped) */
+   /* _mesa_function_pool[36484]: VertexBindingDivisor (will be remapped) */
    "ii\0"
    "glVertexBindingDivisor\0"
    "\0"
-   /* _mesa_function_pool[36122]: GetPerfMonitorCounterInfoAMD (will be remapped) */
+   /* _mesa_function_pool[36511]: GetPerfMonitorCounterInfoAMD (will be remapped) */
    "iiip\0"
    "glGetPerfMonitorCounterInfoAMD\0"
    "\0"
-   /* _mesa_function_pool[36159]: UniformBlockBinding (will be remapped) */
+   /* _mesa_function_pool[36548]: UniformBlockBinding (will be remapped) */
    "iii\0"
    "glUniformBlockBinding\0"
    "\0"
-   /* _mesa_function_pool[36186]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[36575]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[36202]: CompressedTextureSubImage2D (will be remapped) */
+   /* _mesa_function_pool[36591]: CompressedTextureSubImage2D (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTextureSubImage2D\0"
    "\0"
-   /* _mesa_function_pool[36243]: VertexAttrib4Nusv (will be remapped) */
+   /* _mesa_function_pool[36632]: VertexAttrib4Nusv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[36290]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[36679]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[36325]: VertexP2ui (will be remapped) */
+   /* _mesa_function_pool[36714]: VertexP2ui (will be remapped) */
    "ii\0"
    "glVertexP2ui\0"
    "\0"
-   /* _mesa_function_pool[36342]: ProgramUniform2fv (will be remapped) */
+   /* _mesa_function_pool[36731]: ProgramUniform2fv (will be remapped) */
    "iiip\0"
    "glProgramUniform2fv\0"
    "glProgramUniform2fvEXT\0"
    "\0"
-   /* _mesa_function_pool[36391]: GetTextureLevelParameteriv (will be remapped) */
+   /* _mesa_function_pool[36780]: GetTextureLevelParameteriv (will be remapped) */
    "iiip\0"
    "glGetTextureLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[36426]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[36815]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[36445]: BindAttribLocation (will be remapped) */
+   /* _mesa_function_pool[36834]: BindAttribLocation (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[36495]: TextureStorage2DEXT (will be remapped) */
+   /* _mesa_function_pool[36884]: TextureStorage2DEXT (will be remapped) */
    "iiiiii\0"
    "glTextureStorage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[36525]: TextureParameterIiv (will be remapped) */
+   /* _mesa_function_pool[36914]: TextureParameterIiv (will be remapped) */
    "iip\0"
    "glTextureParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[36552]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[36941]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[36578]: DrawTransformFeedbackInstanced (will be remapped) */
+   /* _mesa_function_pool[36967]: DrawTransformFeedbackInstanced (will be remapped) */
    "iii\0"
    "glDrawTransformFeedbackInstanced\0"
    "\0"
-   /* _mesa_function_pool[36616]: CopyTextureSubImage1D (will be remapped) */
+   /* _mesa_function_pool[37005]: CopyTextureSubImage1D (will be remapped) */
    "iiiiii\0"
    "glCopyTextureSubImage1D\0"
    "\0"
-   /* _mesa_function_pool[36648]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[37037]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[36667]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[37056]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[36695]: GetProgramNamedParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[37084]: GetProgramNamedParameterdvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[36732]: VertexAttribI1iv (will be remapped) */
+   /* _mesa_function_pool[37121]: VertexAttribI1iv (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
    "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[36777]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[37166]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[36792]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[37181]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[36839]: SampleMaski (will be remapped) */
+   /* _mesa_function_pool[37228]: SampleMaski (will be remapped) */
    "ii\0"
    "glSampleMaski\0"
    "\0"
-   /* _mesa_function_pool[36857]: GetFloati_v (will be remapped) */
+   /* _mesa_function_pool[37246]: GetFloati_v (will be remapped) */
    "iip\0"
    "glGetFloati_v\0"
    "\0"
-   /* _mesa_function_pool[36876]: MultiTexCoord2iv (offset 389) */
+   /* _mesa_function_pool[37265]: MultiTexCoord2iv (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[36921]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[37310]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[36941]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[37330]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[37001]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[37390]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[37029]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[37418]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[37055]: GenLists (offset 5) */
+   /* _mesa_function_pool[37444]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[37069]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[37458]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[37089]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[37478]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[37109]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[37498]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[37129]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[37518]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[37157]: GetActiveAttrib (will be remapped) */
+   /* _mesa_function_pool[37546]: GetActiveAttrib (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[37205]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[37594]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[37243]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[37632]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[37261]: ClearBufferData (will be remapped) */
+   /* _mesa_function_pool[37650]: ClearBufferData (will be remapped) */
    "iiiip\0"
    "glClearBufferData\0"
    "\0"
-   /* _mesa_function_pool[37286]: Color3usv (offset 24) */
+   /* _mesa_function_pool[37675]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[37301]: CopyImageSubData (will be remapped) */
+   /* _mesa_function_pool[37690]: CopyImageSubData (will be remapped) */
    "iiiiiiiiiiiiiii\0"
    "glCopyImageSubData\0"
    "\0"
-   /* _mesa_function_pool[37337]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[37726]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[37386]: GenSamplers (will be remapped) */
+   /* _mesa_function_pool[37775]: GenSamplers (will be remapped) */
    "ip\0"
    "glGenSamplers\0"
    "\0"
-   /* _mesa_function_pool[37404]: ClipControl (will be remapped) */
+   /* _mesa_function_pool[37793]: ClipControl (will be remapped) */
    "ii\0"
    "glClipControl\0"
    "\0"
-   /* _mesa_function_pool[37422]: DrawTexfOES (will be remapped) */
+   /* _mesa_function_pool[37811]: DrawTexfOES (will be remapped) */
    "fffff\0"
    "glDrawTexfOES\0"
    "\0"
-   /* _mesa_function_pool[37443]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[37832]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[37465]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[37854]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[37495]: Accum (offset 213) */
+   /* _mesa_function_pool[37884]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[37507]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[37896]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[37528]: Color4x (will be remapped) */
+   /* _mesa_function_pool[37917]: Color4x (will be remapped) */
    "iiii\0"
    "glColor4xOES\0"
    "glColor4x\0"
    "\0"
-   /* _mesa_function_pool[37557]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[37946]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[37615]: Color4s (offset 33) */
+   /* _mesa_function_pool[38004]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[37631]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[38020]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[37656]: GetUniformuiv (will be remapped) */
-   "iip\0"
-   "glGetUniformuivEXT\0"
-   "glGetUniformuiv\0"
+   /* _mesa_function_pool[38045]: EnableVertexAttribArray (will be remapped) */
+   "i\0"
+   "glEnableVertexAttribArray\0"
+   "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[37696]: Color4i (offset 31) */
+   /* _mesa_function_pool[38103]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[37712]: Color4f (offset 29) */
+   /* _mesa_function_pool[38119]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[37728]: Color4d (offset 27) */
+   /* _mesa_function_pool[38135]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[37744]: Color4b (offset 25) */
+   /* _mesa_function_pool[38151]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[37760]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[38167]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[37782]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[38189]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[37812]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[38219]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[37830]: VertexAttribLFormat (will be remapped) */
+   /* _mesa_function_pool[38237]: VertexAttribLFormat (will be remapped) */
    "iiii\0"
    "glVertexAttribLFormat\0"
    "\0"
-   /* _mesa_function_pool[37858]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[38265]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[37886]: ShaderSource (will be remapped) */
+   /* _mesa_function_pool[38293]: ShaderSource (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[37925]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[38332]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[37940]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[38347]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[37975]: NormalP3ui (will be remapped) */
+   /* _mesa_function_pool[38382]: NormalP3ui (will be remapped) */
    "ii\0"
    "glNormalP3ui\0"
    "\0"
-   /* _mesa_function_pool[37992]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[38399]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[38037]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[38444]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[38069]: BufferData (will be remapped) */
+   /* _mesa_function_pool[38476]: BufferData (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[38104]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[38511]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[38150]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[38557]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[38177]: GetTexParameterPointervAPPLE (dynamic) */
+   /* _mesa_function_pool[38584]: GetTexParameterPointervAPPLE (dynamic) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[38213]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[38620]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "glTexGenfvOES\0"
    "\0"
-   /* _mesa_function_pool[38243]: GetVertexAttribiv (will be remapped) */
+   /* _mesa_function_pool[38650]: GetVertexAttribiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[38291]: TexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[38698]: TexCoordP2uiv (will be remapped) */
    "ip\0"
    "glTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[38311]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[38718]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[38355]: Uniform3fv (will be remapped) */
+   /* _mesa_function_pool[38762]: Uniform3fv (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[38389]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[38796]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "glBlendEquationOES\0"
    "\0"
-   /* _mesa_function_pool[38446]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[38853]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[38471]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[38878]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[38535]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[38942]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[38554]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[38961]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[38580]: PushName (offset 201) */
+   /* _mesa_function_pool[38987]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[38594]: GenFencesNV (dynamic) */
+   /* _mesa_function_pool[39001]: GenFencesNV (dynamic) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[38612]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[39019]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[38637]: DeleteRenderbuffers (will be remapped) */
+   /* _mesa_function_pool[39044]: DeleteRenderbuffers (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "glDeleteRenderbuffersOES\0"
    "\0"
-   /* _mesa_function_pool[38713]: VertexAttrib1dv (will be remapped) */
+   /* _mesa_function_pool[39120]: VertexAttrib1dv (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[38756]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[39163]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[38790]: IsShader (will be remapped) */
+   /* _mesa_function_pool[39197]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[38804]: Rotated (offset 299) */
+   /* _mesa_function_pool[39211]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[38820]: GenPerfMonitorsAMD (will be remapped) */
+   /* _mesa_function_pool[39227]: GenPerfMonitorsAMD (will be remapped) */
    "ip\0"
    "glGenPerfMonitorsAMD\0"
    "\0"
-   /* _mesa_function_pool[38845]: PointParameterxv (will be remapped) */
+   /* _mesa_function_pool[39252]: PointParameterxv (will be remapped) */
    "ip\0"
    "glPointParameterxvOES\0"
    "glPointParameterxv\0"
    "\0"
-   /* _mesa_function_pool[38890]: Rotatex (will be remapped) */
+   /* _mesa_function_pool[39297]: Rotatex (will be remapped) */
    "iiii\0"
    "glRotatexOES\0"
    "glRotatex\0"
    "\0"
-   /* _mesa_function_pool[38919]: FramebufferTextureLayer (will be remapped) */
+   /* _mesa_function_pool[39326]: FramebufferTextureLayer (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerARB\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[39010]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[39417]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[39026]: ProgramUniformMatrix3fv (will be remapped) */
+   /* _mesa_function_pool[39433]: ProgramUniformMatrix3fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3fv\0"
    "glProgramUniformMatrix3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[39088]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[39495]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[39105]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[39512]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[39142]: MultiDrawArraysIndirect (will be remapped) */
+   /* _mesa_function_pool[39549]: MultiDrawArraysIndirect (will be remapped) */
    "ipii\0"
    "glMultiDrawArraysIndirect\0"
    "\0"
-   /* _mesa_function_pool[39174]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[39581]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[39213]: ProgramUniformMatrix4dv (will be remapped) */
+   /* _mesa_function_pool[39620]: ProgramUniformMatrix4dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4dv\0"
    "\0"
-   /* _mesa_function_pool[39246]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[39653]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[39270]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[39677]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[39290]: SecondaryColor3bv (will be remapped) */
+   /* _mesa_function_pool[39697]: SecondaryColor3bv (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[39336]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[39743]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[39364]: GetCombinerOutputParameterivNV (dynamic) */
+   /* _mesa_function_pool[39771]: GetCombinerOutputParameterivNV (dynamic) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[39403]: DrawTexxvOES (will be remapped) */
+   /* _mesa_function_pool[39810]: DrawTexxvOES (will be remapped) */
    "p\0"
    "glDrawTexxvOES\0"
    "\0"
-   /* _mesa_function_pool[39421]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[39828]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[39443]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[39850]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[39458]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[39865]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[39475]: FogCoorddv (will be remapped) */
+   /* _mesa_function_pool[39882]: FogCoorddv (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[39507]: VDPAUUnregisterSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[39914]: VDPAUUnregisterSurfaceNV (will be remapped) */
    "i\0"
    "glVDPAUUnregisterSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[39537]: ColorP3ui (will be remapped) */
+   /* _mesa_function_pool[39944]: ColorP3ui (will be remapped) */
    "ii\0"
    "glColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[39553]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[39960]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[39575]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[39982]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[39608]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[40015]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[39643]: Flush (offset 217) */
+   /* _mesa_function_pool[40050]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[39653]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[40060]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[39699]: FogCoordd (will be remapped) */
+   /* _mesa_function_pool[40106]: FogCoordd (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[39729]: Uniform3iv (will be remapped) */
+   /* _mesa_function_pool[40136]: Uniform3iv (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[39763]: TexStorage2DMultisample (will be remapped) */
+   /* _mesa_function_pool[40170]: TexStorage2DMultisample (will be remapped) */
    "iiiiii\0"
    "glTexStorage2DMultisample\0"
    "\0"
-   /* _mesa_function_pool[39797]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[40204]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[39817]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[40224]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[39841]: VertexAttrib4iv (will be remapped) */
+   /* _mesa_function_pool[40248]: VertexAttrib4iv (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[39884]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[40291]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "glCopyTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[39961]: PolygonOffsetClampEXT (will be remapped) */
+   /* _mesa_function_pool[40368]: PolygonOffsetClampEXT (will be remapped) */
    "fff\0"
    "glPolygonOffsetClampEXT\0"
    "\0"
-   /* _mesa_function_pool[39990]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[40397]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[40010]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[40417]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[40032]: Indexiv (offset 49) */
+   /* _mesa_function_pool[40439]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[40045]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[40452]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[40060]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[40467]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[40075]: TexEnvx (will be remapped) */
+   /* _mesa_function_pool[40482]: TexEnvx (will be remapped) */
    "iii\0"
    "glTexEnvxOES\0"
    "glTexEnvx\0"
    "\0"
-   /* _mesa_function_pool[40103]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[40510]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[40128]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[40535]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[40184]: InvalidateBufferSubData (will be remapped) */
+   /* _mesa_function_pool[40591]: InvalidateBufferSubData (will be remapped) */
    "iii\0"
    "glInvalidateBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[40215]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[40622]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[40242]: ClearTexImage (will be remapped) */
+   /* _mesa_function_pool[40649]: ClearTexImage (will be remapped) */
    "iiiip\0"
    "glClearTexImage\0"
    "\0"
-   /* _mesa_function_pool[40265]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[40672]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[40285]: BeginPerfQueryINTEL (will be remapped) */
+   /* _mesa_function_pool[40692]: BeginPerfQueryINTEL (will be remapped) */
    "i\0"
    "glBeginPerfQueryINTEL\0"
    "\0"
-   /* _mesa_function_pool[40310]: SamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[40717]: SamplerParameterfv (will be remapped) */
    "iip\0"
    "glSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[40336]: CompressedTextureSubImage1D (will be remapped) */
+   /* _mesa_function_pool[40743]: CompressedTextureSubImage1D (will be remapped) */
    "iiiiiip\0"
    "glCompressedTextureSubImage1D\0"
    "\0"
-   /* _mesa_function_pool[40375]: ProgramUniformMatrix4x2dv (will be remapped) */
+   /* _mesa_function_pool[40782]: ProgramUniformMatrix4x2dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4x2dv\0"
    "\0"
-   /* _mesa_function_pool[40410]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[40817]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[40468]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[40875]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[40484]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[40891]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[40508]: Color4fv (offset 30) */
+   /* _mesa_function_pool[40915]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[40522]: GetnMinmaxARB (will be remapped) */
+   /* _mesa_function_pool[40929]: GetnMinmaxARB (will be remapped) */
    "iiiiip\0"
    "glGetnMinmaxARB\0"
    "\0"
-   /* _mesa_function_pool[40546]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[40953]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[40567]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[40974]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[40602]: Lightiv (offset 162) */
+   /* _mesa_function_pool[41009]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[40617]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[41024]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[40642]: TransformFeedbackVaryings (will be remapped) */
+   /* _mesa_function_pool[41049]: TransformFeedbackVaryings (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryings\0"
    "glTransformFeedbackVaryingsEXT\0"
    "\0"
-   /* _mesa_function_pool[40707]: VertexAttrib3sv (will be remapped) */
+   /* _mesa_function_pool[41114]: VertexAttrib3sv (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[40750]: IsVertexArray (will be remapped) */
+   /* _mesa_function_pool[41157]: IsVertexArray (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "glIsVertexArrayOES\0"
    "\0"
-   /* _mesa_function_pool[40809]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[41216]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[40831]: ProgramUniform4ui (will be remapped) */
+   /* _mesa_function_pool[41238]: ProgramUniform4ui (will be remapped) */
    "iiiiii\0"
    "glProgramUniform4ui\0"
    "glProgramUniform4uiEXT\0"
    "\0"
-   /* _mesa_function_pool[40882]: Uniform1f (will be remapped) */
+   /* _mesa_function_pool[41289]: Uniform1f (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[40913]: Uniform1d (will be remapped) */
+   /* _mesa_function_pool[41320]: Uniform1d (will be remapped) */
    "id\0"
    "glUniform1d\0"
    "\0"
-   /* _mesa_function_pool[40929]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[41336]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[40958]: Uniform1i (will be remapped) */
+   /* _mesa_function_pool[41365]: Uniform1i (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[40989]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[41396]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[41012]: PixelTexGenSGIX (dynamic) */
+   /* _mesa_function_pool[41419]: PixelTexGenSGIX (dynamic) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[41033]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[41440]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[41060]: UseProgram (will be remapped) */
+   /* _mesa_function_pool[41467]: UseProgram (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[41098]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[41505]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[41123]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[41530]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[41158]: GetFragDataLocation (will be remapped) */
+   /* _mesa_function_pool[41565]: GetFragDataLocation (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[41209]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[41616]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[41228]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[41635]: ClearNamedBufferSubData (will be remapped) */
+   "iiiiiip\0"
+   "glClearNamedBufferSubData\0"
+   "\0"
+   /* _mesa_function_pool[41670]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[41251]: GetFenceivNV (dynamic) */
+   /* _mesa_function_pool[41693]: GetFenceivNV (dynamic) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[41271]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[41713]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "glCurrentPaletteMatrixOES\0"
    "\0"
-   /* _mesa_function_pool[41326]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[41768]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "glGenVertexArraysOES\0"
    "\0"
-   /* _mesa_function_pool[41369]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[41811]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[41412]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[41854]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[41436]: Color3s (offset 17) */
+   /* _mesa_function_pool[41878]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[41451]: TextureStorage2DMultisample (will be remapped) */
+   /* _mesa_function_pool[41893]: TextureStorage2DMultisample (will be remapped) */
    "iiiiii\0"
    "glTextureStorage2DMultisample\0"
    "\0"
-   /* _mesa_function_pool[41489]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[41931]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[41513]: Color3i (offset 15) */
+   /* _mesa_function_pool[41955]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[41528]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[41970]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[41546]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[41988]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[41564]: Color3b (offset 9) */
+   /* _mesa_function_pool[42006]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[41579]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[42021]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[41603]: Color3f (offset 13) */
+   /* _mesa_function_pool[42045]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[41618]: Color3d (offset 11) */
+   /* _mesa_function_pool[42060]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[41633]: GetVertexAttribdv (will be remapped) */
+   /* _mesa_function_pool[42075]: GetVertexAttribdv (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[41681]: GetBufferPointerv (will be remapped) */
+   /* _mesa_function_pool[42123]: GetBufferPointerv (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "glGetBufferPointervOES\0"
    "\0"
-   /* _mesa_function_pool[41752]: GenFramebuffers (will be remapped) */
+   /* _mesa_function_pool[42194]: GenFramebuffers (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "glGenFramebuffersOES\0"
    "\0"
-   /* _mesa_function_pool[41816]: GenBuffers (will be remapped) */
+   /* _mesa_function_pool[42258]: GenBuffers (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[41849]: ClearDepthx (will be remapped) */
+   /* _mesa_function_pool[42291]: ClearDepthx (will be remapped) */
    "i\0"
    "glClearDepthxOES\0"
    "glClearDepthx\0"
    "\0"
-   /* _mesa_function_pool[41883]: BlendEquationSeparate (will be remapped) */
+   /* _mesa_function_pool[42325]: BlendEquationSeparate (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "glBlendEquationSeparateOES\0"
    "\0"
-   /* _mesa_function_pool[41992]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[42434]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[42027]: MultiTexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[42469]: MultiTexCoordP4ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[42052]: VertexAttribIPointer (will be remapped) */
+   /* _mesa_function_pool[42494]: VertexAttribIPointer (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[42108]: EnableVertexAttribArray (will be remapped) */
-   "i\0"
-   "glEnableVertexAttribArray\0"
-   "glEnableVertexAttribArrayARB\0"
+   /* _mesa_function_pool[42550]: ProgramUniform4fv (will be remapped) */
+   "iiip\0"
+   "glProgramUniform4fv\0"
+   "glProgramUniform4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[42166]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[42599]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[42185]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[42618]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[42203]: CopyTextureSubImage3D (will be remapped) */
+   /* _mesa_function_pool[42636]: CopyTextureSubImage3D (will be remapped) */
    "iiiiiiiii\0"
    "glCopyTextureSubImage3D\0"
    "\0"
-   /* _mesa_function_pool[42238]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[42671]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[42257]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[42690]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[42276]: TextureView (will be remapped) */
+   /* _mesa_function_pool[42709]: TextureView (will be remapped) */
    "iiiiiiii\0"
    "glTextureView\0"
    "\0"
-   /* _mesa_function_pool[42300]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[42733]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[42316]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[42749]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "glTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[42383]: Bitmap (offset 8) */
+   /* _mesa_function_pool[42816]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[42401]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[42834]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisorARB\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[42452]: DrawTransformFeedbackStream (will be remapped) */
+   /* _mesa_function_pool[42885]: DrawTransformFeedbackStream (will be remapped) */
    "iii\0"
    "glDrawTransformFeedbackStream\0"
    "\0"
-   /* _mesa_function_pool[42487]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[42920]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[42505]: EndPerfQueryINTEL (will be remapped) */
+   /* _mesa_function_pool[42938]: EndPerfQueryINTEL (will be remapped) */
    "i\0"
    "glEndPerfQueryINTEL\0"
    "\0"
-   /* _mesa_function_pool[42528]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[42961]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[42555]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[42988]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[42592]: GetActiveUniform (will be remapped) */
+   /* _mesa_function_pool[43025]: GetActiveUniform (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[42642]: AlphaFuncx (will be remapped) */
+   /* _mesa_function_pool[43075]: AlphaFuncx (will be remapped) */
    "ii\0"
    "glAlphaFuncxOES\0"
    "glAlphaFuncx\0"
    "\0"
-   /* _mesa_function_pool[42675]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[43108]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[42720]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[43153]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[42740]: Map1d (offset 220) */
+   /* _mesa_function_pool[43173]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[42756]: Map1f (offset 221) */
+   /* _mesa_function_pool[43189]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[42772]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[43205]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[42824]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[43257]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[42861]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[43294]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[42882]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[43315]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[42906]: Rotatef (offset 300) */
+   /* _mesa_function_pool[43339]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[42922]: GetFinalCombinerInputParameterivNV (dynamic) */
+   /* _mesa_function_pool[43355]: GetFinalCombinerInputParameterivNV (dynamic) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[42964]: SecondaryColorP3ui (will be remapped) */
+   /* _mesa_function_pool[43397]: SecondaryColorP3ui (will be remapped) */
    "ii\0"
    "glSecondaryColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[42989]: BindTextures (will be remapped) */
+   /* _mesa_function_pool[43422]: BindTextures (will be remapped) */
    "iip\0"
    "glBindTextures\0"
    "\0"
-   /* _mesa_function_pool[43009]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[43442]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[43036]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[43469]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[43060]: Rectiv (offset 91) */
+   /* _mesa_function_pool[43493]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[43073]: MultiTexCoord1iv (offset 381) */
+   /* _mesa_function_pool[43506]: MultiTexCoord1iv (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[43118]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[43551]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[43141]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[43574]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[43161]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[43594]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[43176]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[43609]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[43202]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[43635]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[43217]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[43650]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[43234]: DiscardFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[43667]: DiscardFramebufferEXT (will be remapped) */
    "iip\0"
    "glDiscardFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[43263]: Uniform2f (will be remapped) */
+   /* _mesa_function_pool[43696]: Uniform2f (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[43295]: Uniform2d (will be remapped) */
+   /* _mesa_function_pool[43728]: Uniform2d (will be remapped) */
    "idd\0"
    "glUniform2d\0"
    "\0"
-   /* _mesa_function_pool[43312]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[43745]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[43337]: LineWidth (offset 168) */
+   /* _mesa_function_pool[43770]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[43352]: Uniform2i (will be remapped) */
+   /* _mesa_function_pool[43785]: Uniform2i (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[43384]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[43817]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[43422]: Lightxv (will be remapped) */
+   /* _mesa_function_pool[43855]: Lightxv (will be remapped) */
    "iip\0"
    "glLightxvOES\0"
    "glLightxv\0"
    "\0"
-   /* _mesa_function_pool[43450]: DepthRangeIndexed (will be remapped) */
+   /* _mesa_function_pool[43883]: DepthRangeIndexed (will be remapped) */
    "idd\0"
    "glDepthRangeIndexed\0"
    "\0"
-   /* _mesa_function_pool[43475]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[43908]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[43539]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[43972]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[43570]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[44003]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[43607]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[44040]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[43628]: TexImage3DMultisample (will be remapped) */
+   /* _mesa_function_pool[44061]: TexImage3DMultisample (will be remapped) */
    "iiiiiii\0"
    "glTexImage3DMultisample\0"
    "\0"
-   /* _mesa_function_pool[43661]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[44094]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[43685]: GetUniformBlockIndex (will be remapped) */
+   /* _mesa_function_pool[44118]: GetUniformBlockIndex (will be remapped) */
    "ip\0"
    "glGetUniformBlockIndex\0"
    "\0"
-   /* _mesa_function_pool[43712]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[44145]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[43731]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[44164]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[43784]: SampleCoverage (will be remapped) */
+   /* _mesa_function_pool[44217]: SampleCoverage (will be remapped) */
    "fi\0"
    "glSampleCoverage\0"
    "glSampleCoverageARB\0"
    "\0"
-   /* _mesa_function_pool[43825]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[44258]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[43856]: Color3iv (offset 16) */
+   /* _mesa_function_pool[44289]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[43870]: DrawElements (offset 311) */
+   /* _mesa_function_pool[44303]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[43891]: ScissorArrayv (will be remapped) */
+   /* _mesa_function_pool[44324]: ScissorArrayv (will be remapped) */
    "iip\0"
    "glScissorArrayv\0"
    "\0"
-   /* _mesa_function_pool[43912]: GetInternalformativ (will be remapped) */
+   /* _mesa_function_pool[44345]: GetInternalformativ (will be remapped) */
    "iiiip\0"
    "glGetInternalformativ\0"
    "\0"
-   /* _mesa_function_pool[43941]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[44374]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[43958]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[44391]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[43974]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[44407]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[43988]: FinishFenceNV (dynamic) */
+   /* _mesa_function_pool[44421]: FinishFenceNV (dynamic) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[44007]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[44440]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[44026]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[44459]: NamedBufferData (will be remapped) */
+   "iipi\0"
+   "glNamedBufferData\0"
+   "\0"
+   /* _mesa_function_pool[44483]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "glGetTexGenivOES\0"
    "\0"
-   /* _mesa_function_pool[44062]: GetFirstPerfQueryIdINTEL (will be remapped) */
+   /* _mesa_function_pool[44519]: GetFirstPerfQueryIdINTEL (will be remapped) */
    "p\0"
    "glGetFirstPerfQueryIdINTEL\0"
    "\0"
-   /* _mesa_function_pool[44092]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[44549]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[44114]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[44571]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[44150]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[44607]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[44179]: UnmapBuffer (will be remapped) */
+   /* _mesa_function_pool[44636]: UnmapBuffer (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "glUnmapBufferOES\0"
    "\0"
-   /* _mesa_function_pool[44230]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[44687]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[44247]: EvalCoord1f (offset 230) */
+   /* _mesa_function_pool[44704]: EvalCoord1f (offset 230) */
    "f\0"
    "glEvalCoord1f\0"
    "\0"
-   /* _mesa_function_pool[44264]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[44721]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[44287]: Materialf (offset 169) */
+   /* _mesa_function_pool[44744]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[44304]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[44761]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[44330]: ProgramUniform1uiv (will be remapped) */
+   /* _mesa_function_pool[44787]: ProgramUniform1uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform1uiv\0"
    "glProgramUniform1uivEXT\0"
    "\0"
-   /* _mesa_function_pool[44381]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[44838]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[44399]: Materialx (will be remapped) */
+   /* _mesa_function_pool[44856]: Materialx (will be remapped) */
    "iii\0"
    "glMaterialxOES\0"
    "glMaterialx\0"
    "\0"
-   /* _mesa_function_pool[44431]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[44888]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[44449]: BindBuffer (will be remapped) */
+   /* _mesa_function_pool[44906]: BindBuffer (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[44482]: ProgramUniform1i (will be remapped) */
+   /* _mesa_function_pool[44939]: ProgramUniform1i (will be remapped) */
    "iii\0"
    "glProgramUniform1i\0"
    "glProgramUniform1iEXT\0"
    "\0"
-   /* _mesa_function_pool[44528]: ProgramUniform1f (will be remapped) */
+   /* _mesa_function_pool[44985]: ProgramUniform1f (will be remapped) */
    "iif\0"
    "glProgramUniform1f\0"
    "glProgramUniform1fEXT\0"
    "\0"
-   /* _mesa_function_pool[44574]: ProgramUniform1d (will be remapped) */
+   /* _mesa_function_pool[45031]: ProgramUniform1d (will be remapped) */
    "iid\0"
    "glProgramUniform1d\0"
    "\0"
-   /* _mesa_function_pool[44598]: WindowPos3iv (will be remapped) */
+   /* _mesa_function_pool[45055]: WindowPos3iv (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[44653]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[45110]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[44716]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[45173]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[44743]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[45200]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[44761]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[45218]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[44788]: Recti (offset 90) */
+   /* _mesa_function_pool[45245]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[44802]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[45259]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[44847]: DeleteSamplers (will be remapped) */
+   /* _mesa_function_pool[45304]: DeleteSamplers (will be remapped) */
    "ip\0"
    "glDeleteSamplers\0"
    "\0"
-   /* _mesa_function_pool[44868]: SamplerParameteri (will be remapped) */
+   /* _mesa_function_pool[45325]: SamplerParameteri (will be remapped) */
    "iii\0"
    "glSamplerParameteri\0"
    "\0"
-   /* _mesa_function_pool[44893]: Rectf (offset 88) */
+   /* _mesa_function_pool[45350]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[44907]: Rectd (offset 86) */
+   /* _mesa_function_pool[45364]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[44921]: MultMatrixx (will be remapped) */
+   /* _mesa_function_pool[45378]: MultMatrixx (will be remapped) */
    "p\0"
    "glMultMatrixxOES\0"
    "glMultMatrixx\0"
    "\0"
-   /* _mesa_function_pool[44955]: Rects (offset 92) */
+   /* _mesa_function_pool[45412]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[44969]: CombinerParameterfNV (dynamic) */
+   /* _mesa_function_pool[45426]: CombinerParameterfNV (dynamic) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[44996]: GetVertexAttribIiv (will be remapped) */
+   /* _mesa_function_pool[45453]: GetVertexAttribIiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[45046]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[45503]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[45068]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[45525]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[45087]: TexEnvxv (will be remapped) */
+   /* _mesa_function_pool[45544]: TexEnvxv (will be remapped) */
    "iip\0"
    "glTexEnvxvOES\0"
    "glTexEnvxv\0"
    "\0"
-   /* _mesa_function_pool[45117]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[45574]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[45136]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[45593]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[45164]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[45621]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[45183]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[45640]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[45202]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[45659]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[45220]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[45677]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[45243]: ProgramUniformMatrix3dv (will be remapped) */
+   /* _mesa_function_pool[45700]: ProgramUniformMatrix3dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3dv\0"
    "\0"
-   /* _mesa_function_pool[45276]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[45733]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[45296]: GetActiveUniformBlockiv (will be remapped) */
+   /* _mesa_function_pool[45753]: GetActiveUniformBlockiv (will be remapped) */
    "iiip\0"
    "glGetActiveUniformBlockiv\0"
    "\0"
-   /* _mesa_function_pool[45328]: GetPerfMonitorCountersAMD (will be remapped) */
+   /* _mesa_function_pool[45785]: GetPerfMonitorCountersAMD (will be remapped) */
    "ippip\0"
    "glGetPerfMonitorCountersAMD\0"
    "\0"
-   /* _mesa_function_pool[45363]: ObjectPtrLabel (will be remapped) */
+   /* _mesa_function_pool[45820]: ObjectPtrLabel (will be remapped) */
    "pip\0"
    "glObjectPtrLabel\0"
    "\0"
-   /* _mesa_function_pool[45385]: Rectfv (offset 89) */
+   /* _mesa_function_pool[45842]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[45398]: BindImageTexture (will be remapped) */
+   /* _mesa_function_pool[45855]: BindImageTexture (will be remapped) */
    "iiiiiii\0"
    "glBindImageTexture\0"
    "\0"
-   /* _mesa_function_pool[45426]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[45883]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "glClearDepthfOES\0"
    "\0"
-   /* _mesa_function_pool[45460]: VertexP4uiv (will be remapped) */
+   /* _mesa_function_pool[45917]: VertexP4uiv (will be remapped) */
    "ip\0"
    "glVertexP4uiv\0"
    "\0"
-   /* _mesa_function_pool[45478]: MinSampleShading (will be remapped) */
+   /* _mesa_function_pool[45935]: MinSampleShading (will be remapped) */
    "f\0"
    "glMinSampleShadingARB\0"
    "glMinSampleShading\0"
    "\0"
-   /* _mesa_function_pool[45522]: GetRenderbufferParameteriv (will be remapped) */
+   /* _mesa_function_pool[45979]: GetRenderbufferParameteriv (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "glGetRenderbufferParameterivOES\0"
    "\0"
-   /* _mesa_function_pool[45620]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[46077]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[45650]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[46107]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[45673]: WindowPos2sv (will be remapped) */
+   /* _mesa_function_pool[46130]: WindowPos2sv (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[45728]: VertexArrayRangeNV (dynamic) */
+   /* _mesa_function_pool[46185]: VertexArrayRangeNV (dynamic) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[45753]: GetPerfMonitorCounterStringAMD (will be remapped) */
+   /* _mesa_function_pool[46210]: GetPerfMonitorCounterStringAMD (will be remapped) */
    "iiipp\0"
    "glGetPerfMonitorCounterStringAMD\0"
    "\0"
-   /* _mesa_function_pool[45793]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[46250]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[45818]: Uniform4iv (will be remapped) */
+   /* _mesa_function_pool[46275]: Uniform4iv (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
@@ -6378,912 +6442,928 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   { 18555, CompressedTexImage1D_remap_index },
-   { 15956, CompressedTexImage2D_remap_index },
-   { 11669, CompressedTexImage3D_remap_index },
-   { 29537, CompressedTexSubImage1D_remap_index },
-   { 35852, CompressedTexSubImage2D_remap_index },
-   {  5966, CompressedTexSubImage3D_remap_index },
-   {  4025, GetCompressedTexImage_remap_index },
-   { 17780, LoadTransposeMatrixd_remap_index },
-   { 17728, LoadTransposeMatrixf_remap_index },
-   { 33178, MultTransposeMatrixd_remap_index },
-   { 12947, MultTransposeMatrixf_remap_index },
-   { 43784, SampleCoverage_remap_index },
-   {  3271, BlendFuncSeparate_remap_index },
-   { 21384, FogCoordPointer_remap_index },
-   { 39699, FogCoordd_remap_index },
-   { 39475, FogCoorddv_remap_index },
-   { 32176, MultiDrawArrays_remap_index },
-   { 30438, PointParameterf_remap_index },
-   {  4686, PointParameterfv_remap_index },
-   { 30396, PointParameteri_remap_index },
-   {  8398, PointParameteriv_remap_index },
-   {  5108, SecondaryColor3b_remap_index },
-   { 39290, SecondaryColor3bv_remap_index },
-   { 33379, SecondaryColor3d_remap_index },
-   { 11802, SecondaryColor3dv_remap_index },
-   {  5204, SecondaryColor3i_remap_index },
-   { 28657, SecondaryColor3iv_remap_index },
-   {  4984, SecondaryColor3s_remap_index },
-   { 15242, SecondaryColor3sv_remap_index },
-   { 21537, SecondaryColor3ub_remap_index },
-   {  6879, SecondaryColor3ubv_remap_index },
-   { 21615, SecondaryColor3ui_remap_index },
-   { 23654, SecondaryColor3uiv_remap_index },
-   { 21428, SecondaryColor3us_remap_index },
-   {  9398, SecondaryColor3usv_remap_index },
-   { 34578, SecondaryColorPointer_remap_index },
-   { 11427, WindowPos2d_remap_index },
-   { 16769, WindowPos2dv_remap_index },
-   { 11374, WindowPos2f_remap_index },
-   { 22955, WindowPos2fv_remap_index },
-   { 11480, WindowPos2i_remap_index },
-   {  6220, WindowPos2iv_remap_index },
-   { 11533, WindowPos2s_remap_index },
-   { 45673, WindowPos2sv_remap_index },
-   { 15489, WindowPos3d_remap_index },
-   { 14973, WindowPos3dv_remap_index },
-   { 15576, WindowPos3f_remap_index },
-   {  8257, WindowPos3fv_remap_index },
-   { 15685, WindowPos3i_remap_index },
-   { 44598, WindowPos3iv_remap_index },
-   { 15801, WindowPos3s_remap_index },
-   { 24402, WindowPos3sv_remap_index },
-   {  6102, BeginQuery_remap_index },
-   { 44449, BindBuffer_remap_index },
-   { 38069, BufferData_remap_index },
-   {  9921, BufferSubData_remap_index },
-   { 30766, DeleteBuffers_remap_index },
-   { 21882, DeleteQueries_remap_index },
-   { 19405, EndQuery_remap_index },
-   { 41816, GenBuffers_remap_index },
+   { 18866, CompressedTexImage1D_remap_index },
+   { 16267, CompressedTexImage2D_remap_index },
+   { 11917, CompressedTexImage3D_remap_index },
+   { 29945, CompressedTexSubImage1D_remap_index },
+   { 36241, CompressedTexSubImage2D_remap_index },
+   {  6133, CompressedTexSubImage3D_remap_index },
+   {  4097, GetCompressedTexImage_remap_index },
+   { 18091, LoadTransposeMatrixd_remap_index },
+   { 18039, LoadTransposeMatrixf_remap_index },
+   { 33586, MultTransposeMatrixd_remap_index },
+   { 13223, MultTransposeMatrixf_remap_index },
+   { 44217, SampleCoverage_remap_index },
+   {  3343, BlendFuncSeparate_remap_index },
+   { 21743, FogCoordPointer_remap_index },
+   { 40106, FogCoordd_remap_index },
+   { 39882, FogCoorddv_remap_index },
+   { 32584, MultiDrawArrays_remap_index },
+   { 30846, PointParameterf_remap_index },
+   {  4841, PointParameterfv_remap_index },
+   { 30804, PointParameteri_remap_index },
+   {  8540, PointParameteriv_remap_index },
+   {  5263, SecondaryColor3b_remap_index },
+   { 39697, SecondaryColor3bv_remap_index },
+   { 33787, SecondaryColor3d_remap_index },
+   { 12050, SecondaryColor3dv_remap_index },
+   {  5359, SecondaryColor3i_remap_index },
+   { 29035, SecondaryColor3iv_remap_index },
+   {  5139, SecondaryColor3s_remap_index },
+   { 15553, SecondaryColor3sv_remap_index },
+   { 21896, SecondaryColor3ub_remap_index },
+   {  7046, SecondaryColor3ubv_remap_index },
+   { 21974, SecondaryColor3ui_remap_index },
+   { 24017, SecondaryColor3uiv_remap_index },
+   { 21787, SecondaryColor3us_remap_index },
+   {  9540, SecondaryColor3usv_remap_index },
+   { 34937, SecondaryColorPointer_remap_index },
+   { 11675, WindowPos2d_remap_index },
+   { 17080, WindowPos2dv_remap_index },
+   { 11622, WindowPos2f_remap_index },
+   { 23314, WindowPos2fv_remap_index },
+   { 11728, WindowPos2i_remap_index },
+   {  6387, WindowPos2iv_remap_index },
+   { 11781, WindowPos2s_remap_index },
+   { 46130, WindowPos2sv_remap_index },
+   { 15800, WindowPos3d_remap_index },
+   { 15284, WindowPos3dv_remap_index },
+   { 15887, WindowPos3f_remap_index },
+   {  8399, WindowPos3fv_remap_index },
+   { 15996, WindowPos3i_remap_index },
+   { 45055, WindowPos3iv_remap_index },
+   { 16112, WindowPos3s_remap_index },
+   { 24798, WindowPos3sv_remap_index },
+   {  6269, BeginQuery_remap_index },
+   { 44906, BindBuffer_remap_index },
+   { 38476, BufferData_remap_index },
+   { 10084, BufferSubData_remap_index },
+   { 31174, DeleteBuffers_remap_index },
+   { 22241, DeleteQueries_remap_index },
+   { 19743, EndQuery_remap_index },
+   { 42258, GenBuffers_remap_index },
    {  1877, GenQueries_remap_index },
-   { 28114, GetBufferParameteriv_remap_index },
-   { 41681, GetBufferPointerv_remap_index },
-   { 30805, GetBufferSubData_remap_index },
-   {  7911, GetQueryObjectiv_remap_index },
-   {  7538, GetQueryObjectuiv_remap_index },
-   { 11995, GetQueryiv_remap_index },
-   { 18218, IsBuffer_remap_index },
-   { 28361, IsQuery_remap_index },
-   { 12106, MapBuffer_remap_index },
-   { 44179, UnmapBuffer_remap_index },
+   { 28492, GetBufferParameteriv_remap_index },
+   { 42123, GetBufferPointerv_remap_index },
+   { 31213, GetBufferSubData_remap_index },
+   {  8078, GetQueryObjectiv_remap_index },
+   {  7705, GetQueryObjectuiv_remap_index },
+   { 12243, GetQueryiv_remap_index },
+   { 18529, IsBuffer_remap_index },
+   { 28739, IsQuery_remap_index },
+   { 12382, MapBuffer_remap_index },
+   { 44636, UnmapBuffer_remap_index },
    {   315, AttachShader_remap_index },
-   { 36445, BindAttribLocation_remap_index },
-   { 41883, BlendEquationSeparate_remap_index },
-   { 31848, CompileShader_remap_index },
-   { 14380, CreateProgram_remap_index },
-   { 30655, CreateShader_remap_index },
-   { 20263, DeleteProgram_remap_index },
-   { 31830, DeleteShader_remap_index },
-   { 43712, DetachShader_remap_index },
-   { 34228, DisableVertexAttribArray_remap_index },
-   { 22736, DrawBuffers_remap_index },
-   { 42108, EnableVertexAttribArray_remap_index },
-   { 37157, GetActiveAttrib_remap_index },
-   { 42592, GetActiveUniform_remap_index },
-   { 17367, GetAttachedShaders_remap_index },
-   { 27048, GetAttribLocation_remap_index },
-   { 11114, GetProgramInfoLog_remap_index },
-   { 22471, GetProgramiv_remap_index },
-   {  3766, GetShaderInfoLog_remap_index },
-   {  7229, GetShaderSource_remap_index },
-   { 17103, GetShaderiv_remap_index },
-   {  6153, GetUniformLocation_remap_index },
-   { 13100, GetUniformfv_remap_index },
+   { 36834, BindAttribLocation_remap_index },
+   { 42325, BlendEquationSeparate_remap_index },
+   { 32256, CompileShader_remap_index },
+   { 14691, CreateProgram_remap_index },
+   { 31063, CreateShader_remap_index },
+   { 20601, DeleteProgram_remap_index },
+   { 32238, DeleteShader_remap_index },
+   { 44145, DetachShader_remap_index },
+   { 34587, DisableVertexAttribArray_remap_index },
+   { 23095, DrawBuffers_remap_index },
+   { 38045, EnableVertexAttribArray_remap_index },
+   { 37546, GetActiveAttrib_remap_index },
+   { 43025, GetActiveUniform_remap_index },
+   { 17678, GetAttachedShaders_remap_index },
+   { 27444, GetAttribLocation_remap_index },
+   { 11304, GetProgramInfoLog_remap_index },
+   { 22830, GetProgramiv_remap_index },
+   {  3838, GetShaderInfoLog_remap_index },
+   {  7396, GetShaderSource_remap_index },
+   { 17414, GetShaderiv_remap_index },
+   {  6320, GetUniformLocation_remap_index },
+   { 13376, GetUniformfv_remap_index },
    {  2134, GetUniformiv_remap_index },
-   { 34954, GetVertexAttribPointerv_remap_index },
-   { 41633, GetVertexAttribdv_remap_index },
-   { 35613, GetVertexAttribfv_remap_index },
-   { 38243, GetVertexAttribiv_remap_index },
-   {  4219, IsProgram_remap_index },
-   { 38790, IsShader_remap_index },
-   { 28850, LinkProgram_remap_index },
-   { 37886, ShaderSource_remap_index },
-   { 37858, StencilFuncSeparate_remap_index },
-   { 35935, StencilMaskSeparate_remap_index },
-   { 37337, StencilOpSeparate_remap_index },
-   { 40882, Uniform1f_remap_index },
-   {  8087, Uniform1fv_remap_index },
-   { 40958, Uniform1i_remap_index },
-   { 18426, Uniform1iv_remap_index },
-   { 43263, Uniform2f_remap_index },
-   { 22637, Uniform2fv_remap_index },
-   { 43352, Uniform2i_remap_index },
-   { 20505, Uniform2iv_remap_index },
+   { 35310, GetVertexAttribPointerv_remap_index },
+   { 42075, GetVertexAttribdv_remap_index },
+   { 36002, GetVertexAttribfv_remap_index },
+   { 38650, GetVertexAttribiv_remap_index },
+   {  4291, IsProgram_remap_index },
+   { 39197, IsShader_remap_index },
+   { 29228, LinkProgram_remap_index },
+   { 38293, ShaderSource_remap_index },
+   { 38265, StencilFuncSeparate_remap_index },
+   { 36324, StencilMaskSeparate_remap_index },
+   { 37726, StencilOpSeparate_remap_index },
+   { 41289, Uniform1f_remap_index },
+   {  8254, Uniform1fv_remap_index },
+   { 41365, Uniform1i_remap_index },
+   { 18737, Uniform1iv_remap_index },
+   { 43696, Uniform2f_remap_index },
+   { 22996, Uniform2fv_remap_index },
+   { 43785, Uniform2i_remap_index },
+   { 20843, Uniform2iv_remap_index },
    {   916, Uniform3f_remap_index },
-   { 38355, Uniform3fv_remap_index },
+   { 38762, Uniform3fv_remap_index },
    {   836, Uniform3i_remap_index },
-   { 39729, Uniform3iv_remap_index },
-   {  4530, Uniform4f_remap_index },
-   {  8809, Uniform4fv_remap_index },
-   {  4477, Uniform4i_remap_index },
-   { 45818, Uniform4iv_remap_index },
-   { 10057, UniformMatrix2fv_remap_index },
-   { 23388, UniformMatrix3fv_remap_index },
-   { 10597, UniformMatrix4fv_remap_index },
-   { 41060, UseProgram_remap_index },
-   { 24860, ValidateProgram_remap_index },
-   { 18514, VertexAttrib1d_remap_index },
-   { 38713, VertexAttrib1dv_remap_index },
-   { 18637, VertexAttrib1s_remap_index },
-   { 35461, VertexAttrib1sv_remap_index },
-   {  8045, VertexAttrib2d_remap_index },
-   { 24153, VertexAttrib2dv_remap_index },
-   {  7957, VertexAttrib2s_remap_index },
-   { 14513, VertexAttrib2sv_remap_index },
-   { 12029, VertexAttrib3d_remap_index },
-   { 22561, VertexAttrib3dv_remap_index },
-   { 11904, VertexAttrib3s_remap_index },
-   { 40707, VertexAttrib3sv_remap_index },
-   { 12152, VertexAttrib4Nbv_remap_index },
-   { 28746, VertexAttrib4Niv_remap_index },
-   { 20841, VertexAttrib4Nsv_remap_index },
+   { 40136, Uniform3iv_remap_index },
+   {  4624, Uniform4f_remap_index },
+   {  8951, Uniform4fv_remap_index },
+   {  4571, Uniform4i_remap_index },
+   { 46275, Uniform4iv_remap_index },
+   { 10220, UniformMatrix2fv_remap_index },
+   { 23751, UniformMatrix3fv_remap_index },
+   { 10760, UniformMatrix4fv_remap_index },
+   { 41467, UseProgram_remap_index },
+   { 25256, ValidateProgram_remap_index },
+   { 18825, VertexAttrib1d_remap_index },
+   { 39120, VertexAttrib1dv_remap_index },
+   { 18975, VertexAttrib1s_remap_index },
+   { 35850, VertexAttrib1sv_remap_index },
+   {  8212, VertexAttrib2d_remap_index },
+   { 24549, VertexAttrib2dv_remap_index },
+   {  8124, VertexAttrib2s_remap_index },
+   { 14824, VertexAttrib2sv_remap_index },
+   { 12277, VertexAttrib3d_remap_index },
+   { 22920, VertexAttrib3dv_remap_index },
+   { 12152, VertexAttrib3s_remap_index },
+   { 41114, VertexAttrib3sv_remap_index },
+   { 12428, VertexAttrib4Nbv_remap_index },
+   { 29124, VertexAttrib4Niv_remap_index },
+   { 21179, VertexAttrib4Nsv_remap_index },
    {  1466, VertexAttrib4Nub_remap_index },
-   { 33733, VertexAttrib4Nubv_remap_index },
-   { 10671, VertexAttrib4Nuiv_remap_index },
-   { 36243, VertexAttrib4Nusv_remap_index },
-   {  9328, VertexAttrib4bv_remap_index },
-   { 29036, VertexAttrib4d_remap_index },
-   { 29431, VertexAttrib4dv_remap_index },
-   { 39841, VertexAttrib4iv_remap_index },
-   { 29104, VertexAttrib4s_remap_index },
-   { 19505, VertexAttrib4sv_remap_index },
-   { 10311, VertexAttrib4ubv_remap_index },
-   { 20796, VertexAttrib4uiv_remap_index },
+   { 34092, VertexAttrib4Nubv_remap_index },
+   { 10834, VertexAttrib4Nuiv_remap_index },
+   { 36632, VertexAttrib4Nusv_remap_index },
+   {  9470, VertexAttrib4bv_remap_index },
+   { 29444, VertexAttrib4d_remap_index },
+   { 29839, VertexAttrib4dv_remap_index },
+   { 40248, VertexAttrib4iv_remap_index },
+   { 29512, VertexAttrib4s_remap_index },
+   { 19843, VertexAttrib4sv_remap_index },
+   { 10474, VertexAttrib4ubv_remap_index },
+   { 21134, VertexAttrib4uiv_remap_index },
    {  1392, VertexAttrib4usv_remap_index },
-   { 33827, VertexAttribPointer_remap_index },
-   { 30202, UniformMatrix2x3fv_remap_index },
+   { 34186, VertexAttribPointer_remap_index },
+   { 30610, UniformMatrix2x3fv_remap_index },
    {   949, UniformMatrix2x4fv_remap_index },
-   { 10644, UniformMatrix3x2fv_remap_index },
-   { 44761, UniformMatrix3x4fv_remap_index },
-   { 40215, UniformMatrix4x2fv_remap_index },
-   { 11947, UniformMatrix4x3fv_remap_index },
-   { 17009, BeginConditionalRender_remap_index },
-   { 24944, BeginTransformFeedback_remap_index },
-   {  7869, BindBufferBase_remap_index },
-   {  7757, BindBufferRange_remap_index },
-   { 23119, BindFragDataLocation_remap_index },
-   { 24261, ClampColor_remap_index },
-   { 17394, ClearBufferfi_remap_index },
-   { 17218, ClearBufferfv_remap_index },
-   { 34674, ClearBufferiv_remap_index },
-   { 39553, ClearBufferuiv_remap_index },
-   { 13490, ColorMaski_remap_index },
-   {  5931, Disablei_remap_index },
-   { 15543, Enablei_remap_index },
-   { 23702, EndConditionalRender_remap_index },
-   { 20068, EndTransformFeedback_remap_index },
-   { 12340, GetBooleani_v_remap_index },
-   { 41158, GetFragDataLocation_remap_index },
-   { 21264, GetIntegeri_v_remap_index },
-   { 29396, GetStringi_remap_index },
-   { 31316, GetTexParameterIiv_remap_index },
-   { 13686, GetTexParameterIuiv_remap_index },
-   { 31530, GetTransformFeedbackVarying_remap_index },
-   { 37656, GetUniformuiv_remap_index },
-   { 44996, GetVertexAttribIiv_remap_index },
-   { 21096, GetVertexAttribIuiv_remap_index },
-   { 34869, IsEnabledi_remap_index },
-   { 20321, TexParameterIiv_remap_index },
-   { 16824, TexParameterIuiv_remap_index },
-   { 40642, TransformFeedbackVaryings_remap_index },
-   {  5599, Uniform1ui_remap_index },
-   { 26453, Uniform1uiv_remap_index },
-   { 25781, Uniform2ui_remap_index },
-   { 13532, Uniform2uiv_remap_index },
-   { 34122, Uniform3ui_remap_index },
-   { 19564, Uniform3uiv_remap_index },
-   { 12263, Uniform4ui_remap_index },
-   { 18460, Uniform4uiv_remap_index },
-   { 36732, VertexAttribI1iv_remap_index },
-   { 11755, VertexAttribI1uiv_remap_index },
-   {  7586, VertexAttribI4bv_remap_index },
-   { 10508, VertexAttribI4sv_remap_index },
-   {  8609, VertexAttribI4ubv_remap_index },
-   {  7045, VertexAttribI4usv_remap_index },
-   { 42052, VertexAttribIPointer_remap_index },
-   {  8556, PrimitiveRestartIndex_remap_index },
-   { 35083, TexBuffer_remap_index },
+   { 10807, UniformMatrix3x2fv_remap_index },
+   { 45218, UniformMatrix3x4fv_remap_index },
+   { 40622, UniformMatrix4x2fv_remap_index },
+   { 12195, UniformMatrix4x3fv_remap_index },
+   { 17320, BeginConditionalRender_remap_index },
+   { 25340, BeginTransformFeedback_remap_index },
+   {  8036, BindBufferBase_remap_index },
+   {  7924, BindBufferRange_remap_index },
+   { 23478, BindFragDataLocation_remap_index },
+   { 24657, ClampColor_remap_index },
+   { 17705, ClearBufferfi_remap_index },
+   { 17529, ClearBufferfv_remap_index },
+   { 21602, ClearBufferiv_remap_index },
+   { 39960, ClearBufferuiv_remap_index },
+   { 13766, ColorMaski_remap_index },
+   {  6098, Disablei_remap_index },
+   { 15854, Enablei_remap_index },
+   { 24065, EndConditionalRender_remap_index },
+   { 20406, EndTransformFeedback_remap_index },
+   { 12616, GetBooleani_v_remap_index },
+   { 41565, GetFragDataLocation_remap_index },
+   { 21623, GetIntegeri_v_remap_index },
+   { 29804, GetStringi_remap_index },
+   { 31724, GetTexParameterIiv_remap_index },
+   { 13962, GetTexParameterIuiv_remap_index },
+   { 31938, GetTransformFeedbackVarying_remap_index },
+   {  2952, GetUniformuiv_remap_index },
+   { 45453, GetVertexAttribIiv_remap_index },
+   { 21434, GetVertexAttribIuiv_remap_index },
+   { 35225, IsEnabledi_remap_index },
+   { 20659, TexParameterIiv_remap_index },
+   { 17135, TexParameterIuiv_remap_index },
+   { 41049, TransformFeedbackVaryings_remap_index },
+   { 35604, Uniform1ui_remap_index },
+   { 26849, Uniform1uiv_remap_index },
+   { 26177, Uniform2ui_remap_index },
+   { 13808, Uniform2uiv_remap_index },
+   { 34481, Uniform3ui_remap_index },
+   { 19902, Uniform3uiv_remap_index },
+   { 12539, Uniform4ui_remap_index },
+   { 18771, Uniform4uiv_remap_index },
+   { 37121, VertexAttribI1iv_remap_index },
+   { 12003, VertexAttribI1uiv_remap_index },
+   {  7753, VertexAttribI4bv_remap_index },
+   { 10671, VertexAttribI4sv_remap_index },
+   {  8751, VertexAttribI4ubv_remap_index },
+   {  7212, VertexAttribI4usv_remap_index },
+   { 42494, VertexAttribIPointer_remap_index },
+   {  8698, PrimitiveRestartIndex_remap_index },
+   { 35439, TexBuffer_remap_index },
    {   111, FramebufferTexture_remap_index },
-   { 24696, GetBufferParameteri64v_remap_index },
-   { 18146, GetInteger64i_v_remap_index },
-   { 42401, VertexAttribDivisor_remap_index },
-   { 45478, MinSampleShading_remap_index },
-   {  7274, BindProgramARB_remap_index },
-   { 32042, DeleteProgramsARB_remap_index },
-   { 15630, GenProgramsARB_remap_index },
-   { 14556, GetProgramEnvParameterdvARB_remap_index },
-   { 30731, GetProgramEnvParameterfvARB_remap_index },
-   { 32221, GetProgramLocalParameterdvARB_remap_index },
-   { 39105, GetProgramLocalParameterfvARB_remap_index },
-   { 23317, GetProgramStringARB_remap_index },
-   {  8442, GetProgramivARB_remap_index },
-   { 32572, IsProgramARB_remap_index },
-   { 17848, ProgramEnvParameter4dARB_remap_index },
+   { 25092, GetBufferParameteri64v_remap_index },
+   { 18457, GetInteger64i_v_remap_index },
+   { 42834, VertexAttribDivisor_remap_index },
+   { 45935, MinSampleShading_remap_index },
+   {  7441, BindProgramARB_remap_index },
+   { 32450, DeleteProgramsARB_remap_index },
+   { 15941, GenProgramsARB_remap_index },
+   { 14867, GetProgramEnvParameterdvARB_remap_index },
+   { 31139, GetProgramEnvParameterfvARB_remap_index },
+   { 32629, GetProgramLocalParameterdvARB_remap_index },
+   { 39512, GetProgramLocalParameterfvARB_remap_index },
+   { 23680, GetProgramStringARB_remap_index },
+   {  8584, GetProgramivARB_remap_index },
+   { 32980, IsProgramARB_remap_index },
+   { 18159, ProgramEnvParameter4dARB_remap_index },
    {  2735, ProgramEnvParameter4dvARB_remap_index },
-   { 40410, ProgramEnvParameter4fARB_remap_index },
-   { 25449, ProgramEnvParameter4fvARB_remap_index },
-   { 23752, ProgramLocalParameter4dARB_remap_index },
-   {  4081, ProgramLocalParameter4dvARB_remap_index },
-   { 31746, ProgramLocalParameter4fARB_remap_index },
-   { 19852, ProgramLocalParameter4fvARB_remap_index },
-   { 32644, ProgramStringARB_remap_index },
-   { 12299, VertexAttrib1fARB_remap_index },
-   { 33055, VertexAttrib1fvARB_remap_index },
-   { 22913, VertexAttrib2fARB_remap_index },
-   { 13783, VertexAttrib2fvARB_remap_index },
+   { 40817, ProgramEnvParameter4fARB_remap_index },
+   { 25845, ProgramEnvParameter4fvARB_remap_index },
+   { 24115, ProgramLocalParameter4dARB_remap_index },
+   {  4153, ProgramLocalParameter4dvARB_remap_index },
+   { 32154, ProgramLocalParameter4fARB_remap_index },
+   { 20190, ProgramLocalParameter4fvARB_remap_index },
+   { 33052, ProgramStringARB_remap_index },
+   { 12575, VertexAttrib1fARB_remap_index },
+   { 33463, VertexAttrib1fvARB_remap_index },
+   { 23272, VertexAttrib2fARB_remap_index },
+   { 14059, VertexAttrib2fvARB_remap_index },
    {   334, VertexAttrib3fARB_remap_index },
-   { 27340, VertexAttrib3fvARB_remap_index },
-   { 26170, VertexAttrib4fARB_remap_index },
-   { 14930, VertexAttrib4fvARB_remap_index },
-   { 37443, AttachObjectARB_remap_index },
-   { 23361, CreateProgramObjectARB_remap_index },
-   { 17292, CreateShaderObjectARB_remap_index },
-   { 16015, DeleteObjectARB_remap_index },
-   { 40010, DetachObjectARB_remap_index },
-   { 37782, GetAttachedObjectsARB_remap_index },
-   { 20119, GetHandleARB_remap_index },
-   { 21213, GetInfoLogARB_remap_index },
-   { 22048, GetObjectParameterfvARB_remap_index },
-   { 43825, GetObjectParameterivARB_remap_index },
-   {  5711, DrawArraysInstancedARB_remap_index },
-   {  7453, DrawElementsInstancedARB_remap_index },
-   { 14337, BindFramebuffer_remap_index },
-   {  8465, BindRenderbuffer_remap_index },
-   { 35269, BlitFramebuffer_remap_index },
-   {  6424, CheckFramebufferStatus_remap_index },
-   { 20697, DeleteFramebuffers_remap_index },
-   { 38637, DeleteRenderbuffers_remap_index },
-   { 32482, FramebufferRenderbuffer_remap_index },
-   { 35345, FramebufferTexture1D_remap_index },
-   { 24042, FramebufferTexture2D_remap_index },
-   { 28000, FramebufferTexture3D_remap_index },
-   { 38919, FramebufferTextureLayer_remap_index },
-   { 41752, GenFramebuffers_remap_index },
-   { 34748, GenRenderbuffers_remap_index },
-   {  7697, GenerateMipmap_remap_index },
-   {  5407, GetFramebufferAttachmentParameteriv_remap_index },
-   { 45522, GetRenderbufferParameteriv_remap_index },
-   {  6608, IsFramebuffer_remap_index },
-   { 26535, IsRenderbuffer_remap_index },
+   { 27718, VertexAttrib3fvARB_remap_index },
+   { 26566, VertexAttrib4fARB_remap_index },
+   { 15241, VertexAttrib4fvARB_remap_index },
+   { 37832, AttachObjectARB_remap_index },
+   { 23724, CreateProgramObjectARB_remap_index },
+   { 17603, CreateShaderObjectARB_remap_index },
+   { 16326, DeleteObjectARB_remap_index },
+   { 40417, DetachObjectARB_remap_index },
+   { 38189, GetAttachedObjectsARB_remap_index },
+   { 20457, GetHandleARB_remap_index },
+   { 21551, GetInfoLogARB_remap_index },
+   { 22407, GetObjectParameterfvARB_remap_index },
+   { 44258, GetObjectParameterivARB_remap_index },
+   {  5878, DrawArraysInstancedARB_remap_index },
+   {  7620, DrawElementsInstancedARB_remap_index },
+   { 14648, BindFramebuffer_remap_index },
+   {  8607, BindRenderbuffer_remap_index },
+   { 35658, BlitFramebuffer_remap_index },
+   {  6591, CheckFramebufferStatus_remap_index },
+   { 21035, DeleteFramebuffers_remap_index },
+   { 39044, DeleteRenderbuffers_remap_index },
+   { 32890, FramebufferRenderbuffer_remap_index },
+   { 35734, FramebufferTexture1D_remap_index },
+   { 24438, FramebufferTexture2D_remap_index },
+   { 28378, FramebufferTexture3D_remap_index },
+   { 39326, FramebufferTextureLayer_remap_index },
+   { 42194, GenFramebuffers_remap_index },
+   { 35104, GenRenderbuffers_remap_index },
+   {  7864, GenerateMipmap_remap_index },
+   {  5562, GetFramebufferAttachmentParameteriv_remap_index },
+   { 45979, GetRenderbufferParameteriv_remap_index },
+   {  6775, IsFramebuffer_remap_index },
+   { 26931, IsRenderbuffer_remap_index },
    {   663, RenderbufferStorage_remap_index },
-   { 15413, RenderbufferStorageMultisample_remap_index },
-   { 19755, FramebufferTextureFaceARB_remap_index },
-   {  5334, FlushMappedBufferRange_remap_index },
-   { 32287, MapBufferRange_remap_index },
-   { 13625, BindVertexArray_remap_index },
+   { 15724, RenderbufferStorageMultisample_remap_index },
+   { 20093, FramebufferTextureFaceARB_remap_index },
+   {  5489, FlushMappedBufferRange_remap_index },
+   { 32695, MapBufferRange_remap_index },
+   { 13901, BindVertexArray_remap_index },
    {  1160, DeleteVertexArrays_remap_index },
-   { 41326, GenVertexArrays_remap_index },
-   { 40750, IsVertexArray_remap_index },
-   { 13405, GetActiveUniformBlockName_remap_index },
-   { 45296, GetActiveUniformBlockiv_remap_index },
-   { 21585, GetActiveUniformName_remap_index },
-   { 14484, GetActiveUniformsiv_remap_index },
-   { 43685, GetUniformBlockIndex_remap_index },
-   { 10768, GetUniformIndices_remap_index },
-   { 36159, UniformBlockBinding_remap_index },
-   { 44716, CopyBufferSubData_remap_index },
-   { 45046, ClientWaitSync_remap_index },
-   { 11631, DeleteSync_remap_index },
-   { 36186, FenceSync_remap_index },
-   { 39990, GetInteger64v_remap_index },
-   { 42257, GetSynciv_remap_index },
-   { 16071, IsSync_remap_index },
-   { 34938, WaitSync_remap_index },
-   { 13440, DrawElementsBaseVertex_remap_index },
-   { 17482, DrawElementsInstancedBaseVertex_remap_index },
-   { 39174, DrawRangeElementsBaseVertex_remap_index },
-   { 43384, MultiDrawElementsBaseVertex_remap_index },
-   { 25194, ProvokingVertex_remap_index },
-   {  5656, GetMultisamplefv_remap_index },
-   { 36839, SampleMaski_remap_index },
+   { 41768, GenVertexArrays_remap_index },
+   { 41157, IsVertexArray_remap_index },
+   { 13681, GetActiveUniformBlockName_remap_index },
+   { 45753, GetActiveUniformBlockiv_remap_index },
+   { 21944, GetActiveUniformName_remap_index },
+   { 14795, GetActiveUniformsiv_remap_index },
+   { 44118, GetUniformBlockIndex_remap_index },
+   { 10931, GetUniformIndices_remap_index },
+   { 36548, UniformBlockBinding_remap_index },
+   { 45173, CopyBufferSubData_remap_index },
+   { 45503, ClientWaitSync_remap_index },
+   { 11879, DeleteSync_remap_index },
+   { 36575, FenceSync_remap_index },
+   { 40397, GetInteger64v_remap_index },
+   { 42690, GetSynciv_remap_index },
+   { 16382, IsSync_remap_index },
+   { 35294, WaitSync_remap_index },
+   { 13716, DrawElementsBaseVertex_remap_index },
+   { 17793, DrawElementsInstancedBaseVertex_remap_index },
+   { 39581, DrawRangeElementsBaseVertex_remap_index },
+   { 43817, MultiDrawElementsBaseVertex_remap_index },
+   { 25590, ProvokingVertex_remap_index },
+   {  5823, GetMultisamplefv_remap_index },
+   { 37228, SampleMaski_remap_index },
    {  2006, TexImage2DMultisample_remap_index },
-   { 43628, TexImage3DMultisample_remap_index },
-   { 23830, BlendEquationSeparateiARB_remap_index },
-   { 28493, BlendEquationiARB_remap_index },
-   {  3818, BlendFuncSeparateiARB_remap_index },
-   { 25698, BlendFunciARB_remap_index },
+   { 44061, TexImage3DMultisample_remap_index },
+   { 24226, BlendEquationSeparateiARB_remap_index },
+   { 28871, BlendEquationiARB_remap_index },
+   {  3890, BlendFuncSeparateiARB_remap_index },
+   { 26094, BlendFunciARB_remap_index },
    {  1713, BindFragDataLocationIndexed_remap_index },
-   { 30025, GetFragDataIndex_remap_index },
-   {  2902, BindSampler_remap_index },
-   { 44847, DeleteSamplers_remap_index },
-   { 37386, GenSamplers_remap_index },
+   { 30433, GetFragDataIndex_remap_index },
+   {  2934, BindSampler_remap_index },
+   { 45304, DeleteSamplers_remap_index },
+   { 37775, GenSamplers_remap_index },
    {  2602, GetSamplerParameterIiv_remap_index },
-   {  5900, GetSamplerParameterIuiv_remap_index },
-   { 24124, GetSamplerParameterfv_remap_index },
-   { 25874, GetSamplerParameteriv_remap_index },
-   { 27193, IsSampler_remap_index },
-   {  8869, SamplerParameterIiv_remap_index },
-   { 12690, SamplerParameterIuiv_remap_index },
-   { 30251, SamplerParameterf_remap_index },
-   { 40310, SamplerParameterfv_remap_index },
-   { 44868, SamplerParameteri_remap_index },
-   { 29260, SamplerParameteriv_remap_index },
-   { 24211, GetQueryObjecti64v_remap_index },
-   {  4141, GetQueryObjectui64v_remap_index },
-   { 13247, QueryCounter_remap_index },
-   { 39537, ColorP3ui_remap_index },
-   {  6763, ColorP3uiv_remap_index },
-   { 18246, ColorP4ui_remap_index },
-   { 26935, ColorP4uiv_remap_index },
-   { 14184, MultiTexCoordP1ui_remap_index },
-   { 26670, MultiTexCoordP1uiv_remap_index },
-   { 35543, MultiTexCoordP2ui_remap_index },
-   {  9182, MultiTexCoordP2uiv_remap_index },
-   { 27023, MultiTexCoordP3ui_remap_index },
+   {  6067, GetSamplerParameterIuiv_remap_index },
+   { 24520, GetSamplerParameterfv_remap_index },
+   { 26270, GetSamplerParameteriv_remap_index },
+   { 27589, IsSampler_remap_index },
+   {  9011, SamplerParameterIiv_remap_index },
+   { 12966, SamplerParameterIuiv_remap_index },
+   { 30659, SamplerParameterf_remap_index },
+   { 40717, SamplerParameterfv_remap_index },
+   { 45325, SamplerParameteri_remap_index },
+   { 29668, SamplerParameteriv_remap_index },
+   { 24607, GetQueryObjecti64v_remap_index },
+   {  4213, GetQueryObjectui64v_remap_index },
+   { 13523, QueryCounter_remap_index },
+   { 39944, ColorP3ui_remap_index },
+   {  6930, ColorP3uiv_remap_index },
+   { 18557, ColorP4ui_remap_index },
+   { 27331, ColorP4uiv_remap_index },
+   { 14495, MultiTexCoordP1ui_remap_index },
+   { 27066, MultiTexCoordP1uiv_remap_index },
+   { 35932, MultiTexCoordP2ui_remap_index },
+   {  9324, MultiTexCoordP2uiv_remap_index },
+   { 27419, MultiTexCoordP3ui_remap_index },
    {   425, MultiTexCoordP3uiv_remap_index },
-   { 42027, MultiTexCoordP4ui_remap_index },
-   { 35661, MultiTexCoordP4uiv_remap_index },
-   { 37975, NormalP3ui_remap_index },
-   { 26595, NormalP3uiv_remap_index },
-   { 42964, SecondaryColorP3ui_remap_index },
-   {  5848, SecondaryColorP3uiv_remap_index },
+   { 42469, MultiTexCoordP4ui_remap_index },
+   { 36050, MultiTexCoordP4uiv_remap_index },
+   { 38382, NormalP3ui_remap_index },
+   { 26991, NormalP3uiv_remap_index },
+   { 43397, SecondaryColorP3ui_remap_index },
+   {  6015, SecondaryColorP3uiv_remap_index },
    {   162, TexCoordP1ui_remap_index },
    {   643, TexCoordP1uiv_remap_index },
-   { 27299, TexCoordP2ui_remap_index },
-   { 38291, TexCoordP2uiv_remap_index },
-   { 15288, TexCoordP3ui_remap_index },
-   { 18316, TexCoordP3uiv_remap_index },
-   { 35442, TexCoordP4ui_remap_index },
+   { 27677, TexCoordP2ui_remap_index },
+   { 38698, TexCoordP2uiv_remap_index },
+   { 15599, TexCoordP3ui_remap_index },
+   { 18627, TexCoordP3uiv_remap_index },
+   { 35831, TexCoordP4ui_remap_index },
    {  1796, TexCoordP4uiv_remap_index },
-   { 15357, VertexAttribP1ui_remap_index },
-   {  4193, VertexAttribP1uiv_remap_index },
-   { 30903, VertexAttribP2ui_remap_index },
-   {  5030, VertexAttribP2uiv_remap_index },
+   { 15668, VertexAttribP1ui_remap_index },
+   {  4265, VertexAttribP1uiv_remap_index },
+   { 31311, VertexAttribP2ui_remap_index },
+   {  5185, VertexAttribP2uiv_remap_index },
    {  1514, VertexAttribP3ui_remap_index },
-   { 29286, VertexAttribP3uiv_remap_index },
-   {  4452, VertexAttribP4ui_remap_index },
-   { 16647, VertexAttribP4uiv_remap_index },
-   { 36325, VertexP2ui_remap_index },
-   { 16437, VertexP2uiv_remap_index },
-   { 23344, VertexP3ui_remap_index },
-   {  6135, VertexP3uiv_remap_index },
-   {  3136, VertexP4ui_remap_index },
-   { 45460, VertexP4uiv_remap_index },
+   { 29694, VertexAttribP3uiv_remap_index },
+   {  4546, VertexAttribP4ui_remap_index },
+   { 16958, VertexAttribP4uiv_remap_index },
+   { 36714, VertexP2ui_remap_index },
+   { 16748, VertexP2uiv_remap_index },
+   { 23707, VertexP3ui_remap_index },
+   {  6302, VertexP3uiv_remap_index },
+   {  3208, VertexP4ui_remap_index },
+   { 45917, VertexP4uiv_remap_index },
    {   811, DrawArraysIndirect_remap_index },
-   { 24374, DrawElementsIndirect_remap_index },
-   {  6563, GetUniformdv_remap_index },
-   { 40913, Uniform1d_remap_index },
-   { 14619, Uniform1dv_remap_index },
-   { 43295, Uniform2d_remap_index },
-   { 29413, Uniform2dv_remap_index },
+   { 24770, DrawElementsIndirect_remap_index },
+   {  6730, GetUniformdv_remap_index },
+   { 41320, Uniform1d_remap_index },
+   { 14930, Uniform1dv_remap_index },
+   { 43728, Uniform2d_remap_index },
+   { 29821, Uniform2dv_remap_index },
    {   898, Uniform3d_remap_index },
-   { 30378, Uniform3dv_remap_index },
-   {  4511, Uniform4d_remap_index },
-   { 19933, Uniform4dv_remap_index },
-   {  4116, UniformMatrix2dv_remap_index },
-   { 23273, UniformMatrix2x3dv_remap_index },
-   { 16392, UniformMatrix2x4dv_remap_index },
-   { 30276, UniformMatrix3dv_remap_index },
-   {  4375, UniformMatrix3x2dv_remap_index },
-   {  5056, UniformMatrix3x4dv_remap_index },
-   { 17239, UniformMatrix4dv_remap_index },
-   { 33800, UniformMatrix4x2dv_remap_index },
-   { 18713, UniformMatrix4x3dv_remap_index },
-   { 11140, BindTransformFeedback_remap_index },
-   { 11012, DeleteTransformFeedbacks_remap_index },
-   { 37001, DrawTransformFeedback_remap_index },
-   {  3975, GenTransformFeedbacks_remap_index },
-   { 34374, IsTransformFeedback_remap_index },
-   { 31803, PauseTransformFeedback_remap_index },
-   { 36667, ResumeTransformFeedback_remap_index },
-   { 23207, BeginQueryIndexed_remap_index },
-   { 42452, DrawTransformFeedbackStream_remap_index },
-   { 19654, EndQueryIndexed_remap_index },
-   { 22427, GetQueryIndexediv_remap_index },
-   { 45426, ClearDepthf_remap_index },
-   { 24762, DepthRangef_remap_index },
-   { 39575, GetShaderPrecisionFormat_remap_index },
-   {  3245, ReleaseShaderCompiler_remap_index },
-   { 26012, ShaderBinary_remap_index },
-   { 20137, GetProgramBinary_remap_index },
-   { 12197, ProgramBinary_remap_index },
-   { 12432, ProgramParameteri_remap_index },
-   { 27718, DepthRangeArrayv_remap_index },
-   { 43450, DepthRangeIndexed_remap_index },
-   { 34354, GetDoublei_v_remap_index },
-   { 36857, GetFloati_v_remap_index },
-   { 43891, ScissorArrayv_remap_index },
-   { 25815, ScissorIndexed_remap_index },
-   { 29312, ScissorIndexedv_remap_index },
-   { 19095, ViewportArrayv_remap_index },
-   { 32749, ViewportIndexedf_remap_index },
-   { 20185, ViewportIndexedfv_remap_index },
-   {  8656, GetGraphicsResetStatusARB_remap_index },
-   { 31072, GetnColorTableARB_remap_index },
+   { 30786, Uniform3dv_remap_index },
+   {  4605, Uniform4d_remap_index },
+   { 20271, Uniform4dv_remap_index },
+   {  4188, UniformMatrix2dv_remap_index },
+   { 23636, UniformMatrix2x3dv_remap_index },
+   { 16703, UniformMatrix2x4dv_remap_index },
+   { 30684, UniformMatrix3dv_remap_index },
+   {  4469, UniformMatrix3x2dv_remap_index },
+   {  5211, UniformMatrix3x4dv_remap_index },
+   { 17550, UniformMatrix4dv_remap_index },
+   { 34159, UniformMatrix4x2dv_remap_index },
+   { 19051, UniformMatrix4x3dv_remap_index },
+   { 11330, BindTransformFeedback_remap_index },
+   { 11202, DeleteTransformFeedbacks_remap_index },
+   { 37390, DrawTransformFeedback_remap_index },
+   {  4047, GenTransformFeedbacks_remap_index },
+   { 34733, IsTransformFeedback_remap_index },
+   { 32211, PauseTransformFeedback_remap_index },
+   { 37056, ResumeTransformFeedback_remap_index },
+   { 23566, BeginQueryIndexed_remap_index },
+   { 42885, DrawTransformFeedbackStream_remap_index },
+   { 19992, EndQueryIndexed_remap_index },
+   { 22786, GetQueryIndexediv_remap_index },
+   { 45883, ClearDepthf_remap_index },
+   { 25158, DepthRangef_remap_index },
+   { 39982, GetShaderPrecisionFormat_remap_index },
+   {  3317, ReleaseShaderCompiler_remap_index },
+   { 26408, ShaderBinary_remap_index },
+   { 20475, GetProgramBinary_remap_index },
+   { 12473, ProgramBinary_remap_index },
+   { 12708, ProgramParameteri_remap_index },
+   { 28096, DepthRangeArrayv_remap_index },
+   { 43883, DepthRangeIndexed_remap_index },
+   { 34713, GetDoublei_v_remap_index },
+   { 37246, GetFloati_v_remap_index },
+   { 44324, ScissorArrayv_remap_index },
+   { 26211, ScissorIndexed_remap_index },
+   { 29720, ScissorIndexedv_remap_index },
+   { 19433, ViewportArrayv_remap_index },
+   { 33157, ViewportIndexedf_remap_index },
+   { 20523, ViewportIndexedfv_remap_index },
+   {  8798, GetGraphicsResetStatusARB_remap_index },
+   { 31480, GetnColorTableARB_remap_index },
    {  2868, GetnCompressedTexImageARB_remap_index },
    {  1260, GetnConvolutionFilterARB_remap_index },
-   {  4904, GetnHistogramARB_remap_index },
-   { 18980, GetnMapdvARB_remap_index },
-   { 12581, GetnMapfvARB_remap_index },
-   { 35568, GetnMapivARB_remap_index },
-   { 40522, GetnMinmaxARB_remap_index },
-   {  3671, GetnPixelMapfvARB_remap_index },
-   {  5874, GetnPixelMapuivARB_remap_index },
-   { 11878, GetnPixelMapusvARB_remap_index },
-   { 22821, GetnPolygonStippleARB_remap_index },
-   { 29793, GetnSeparableFilterARB_remap_index },
-   { 10356, GetnTexImageARB_remap_index },
-   { 28825, GetnUniformdvARB_remap_index },
-   { 35180, GetnUniformfvARB_remap_index },
-   {  3220, GetnUniformivARB_remap_index },
-   { 14044, GetnUniformuivARB_remap_index },
-   { 26231, ReadnPixelsARB_remap_index },
-   { 33982, DrawArraysInstancedBaseInstance_remap_index },
-   { 10553, DrawElementsInstancedBaseInstance_remap_index },
+   {  5059, GetnHistogramARB_remap_index },
+   { 19318, GetnMapdvARB_remap_index },
+   { 12857, GetnMapfvARB_remap_index },
+   { 35957, GetnMapivARB_remap_index },
+   { 40929, GetnMinmaxARB_remap_index },
+   {  3743, GetnPixelMapfvARB_remap_index },
+   {  6041, GetnPixelMapuivARB_remap_index },
+   { 12126, GetnPixelMapusvARB_remap_index },
+   { 23180, GetnPolygonStippleARB_remap_index },
+   { 30201, GetnSeparableFilterARB_remap_index },
+   { 10519, GetnTexImageARB_remap_index },
+   { 29203, GetnUniformdvARB_remap_index },
+   { 35536, GetnUniformfvARB_remap_index },
+   {  3292, GetnUniformivARB_remap_index },
+   { 14320, GetnUniformuivARB_remap_index },
+   { 26627, ReadnPixelsARB_remap_index },
+   { 34341, DrawArraysInstancedBaseInstance_remap_index },
+   { 10716, DrawElementsInstancedBaseInstance_remap_index },
    {  2680, DrawElementsInstancedBaseVertexBaseInstance_remap_index },
-   { 36578, DrawTransformFeedbackInstanced_remap_index },
-   { 13738, DrawTransformFeedbackStreamInstanced_remap_index },
-   { 43912, GetInternalformativ_remap_index },
-   { 20282, GetActiveAtomicCounterBufferiv_remap_index },
-   { 45398, BindImageTexture_remap_index },
-   { 21961, MemoryBarrier_remap_index },
-   { 35248, TexStorage1D_remap_index },
-   { 23984, TexStorage2D_remap_index },
-   { 27977, TexStorage3D_remap_index },
+   { 36967, DrawTransformFeedbackInstanced_remap_index },
+   { 14014, DrawTransformFeedbackStreamInstanced_remap_index },
+   { 44345, GetInternalformativ_remap_index },
+   { 20620, GetActiveAtomicCounterBufferiv_remap_index },
+   { 45855, BindImageTexture_remap_index },
+   { 22320, MemoryBarrier_remap_index },
+   { 35637, TexStorage1D_remap_index },
+   { 24380, TexStorage2D_remap_index },
+   { 28355, TexStorage3D_remap_index },
    {  1437, TextureStorage1DEXT_remap_index },
-   { 36495, TextureStorage2DEXT_remap_index },
-   { 22882, TextureStorage3DEXT_remap_index },
-   { 37261, ClearBufferData_remap_index },
+   { 36884, TextureStorage2DEXT_remap_index },
+   { 23241, TextureStorage3DEXT_remap_index },
+   { 37650, ClearBufferData_remap_index },
    {  2172, ClearBufferSubData_remap_index },
-   { 32330, DispatchCompute_remap_index },
-   {  6508, DispatchComputeIndirect_remap_index },
-   { 37301, CopyImageSubData_remap_index },
-   { 42276, TextureView_remap_index },
-   { 22321, BindVertexBuffer_remap_index },
-   { 30551, VertexAttribBinding_remap_index },
-   { 31099, VertexAttribFormat_remap_index },
-   { 33923, VertexAttribIFormat_remap_index },
-   { 37830, VertexAttribLFormat_remap_index },
-   { 36095, VertexBindingDivisor_remap_index },
-   { 39142, MultiDrawArraysIndirect_remap_index },
-   { 18678, MultiDrawElementsIndirect_remap_index },
-   { 18613, TexBufferRange_remap_index },
-   { 39763, TexStorage2DMultisample_remap_index },
-   { 29205, TexStorage3DMultisample_remap_index },
-   {  3417, BufferStorage_remap_index },
-   { 40242, ClearTexImage_remap_index },
-   { 13373, ClearTexSubImage_remap_index },
-   {  4288, BindBuffersBase_remap_index },
-   { 14903, BindBuffersRange_remap_index },
-   { 10987, BindImageTextures_remap_index },
+   { 32738, DispatchCompute_remap_index },
+   {  6675, DispatchComputeIndirect_remap_index },
+   { 37690, CopyImageSubData_remap_index },
+   { 42709, TextureView_remap_index },
+   { 22680, BindVertexBuffer_remap_index },
+   { 30959, VertexAttribBinding_remap_index },
+   { 31507, VertexAttribFormat_remap_index },
+   { 34282, VertexAttribIFormat_remap_index },
+   { 38237, VertexAttribLFormat_remap_index },
+   { 36484, VertexBindingDivisor_remap_index },
+   { 39549, MultiDrawArraysIndirect_remap_index },
+   { 19016, MultiDrawElementsIndirect_remap_index },
+   { 18951, TexBufferRange_remap_index },
+   { 40170, TexStorage2DMultisample_remap_index },
+   { 29613, TexStorage3DMultisample_remap_index },
+   {  3489, BufferStorage_remap_index },
+   { 40649, ClearTexImage_remap_index },
+   { 13649, ClearTexSubImage_remap_index },
+   {  4360, BindBuffersBase_remap_index },
+   { 15214, BindBuffersRange_remap_index },
+   { 11177, BindImageTextures_remap_index },
    {  2848, BindSamplers_remap_index },
-   { 42989, BindTextures_remap_index },
-   { 25847, BindVertexBuffers_remap_index },
-   { 37404, ClipControl_remap_index },
-   { 20209, BindTextureUnit_remap_index },
-   { 40336, CompressedTextureSubImage1D_remap_index },
-   { 36202, CompressedTextureSubImage2D_remap_index },
-   { 34023, CompressedTextureSubImage3D_remap_index },
-   { 36616, CopyTextureSubImage1D_remap_index },
-   { 32669, CopyTextureSubImage2D_remap_index },
-   { 42203, CopyTextureSubImage3D_remap_index },
-   { 29474, CreateTextures_remap_index },
-   { 32015, GenerateTextureMipmap_remap_index },
+   { 43422, BindTextures_remap_index },
+   { 26243, BindVertexBuffers_remap_index },
+   { 37793, ClipControl_remap_index },
+   { 20547, BindTextureUnit_remap_index },
+   { 23591, ClearNamedBufferData_remap_index },
+   { 41635, ClearNamedBufferSubData_remap_index },
+   { 40743, CompressedTextureSubImage1D_remap_index },
+   { 36591, CompressedTextureSubImage2D_remap_index },
+   { 34382, CompressedTextureSubImage3D_remap_index },
+   {  2902, CopyNamedBufferSubData_remap_index },
+   { 37005, CopyTextureSubImage1D_remap_index },
+   { 33077, CopyTextureSubImage2D_remap_index },
+   { 42636, CopyTextureSubImage3D_remap_index },
+   {  5779, CreateBuffers_remap_index },
+   { 29882, CreateTextures_remap_index },
+   { 14460, FlushMappedNamedBufferRange_remap_index },
+   { 32423, GenerateTextureMipmap_remap_index },
    {   391, GetCompressedTextureImage_remap_index },
-   { 18043, GetTextureImage_remap_index },
-   { 33698, GetTextureLevelParameterfv_remap_index },
-   { 36391, GetTextureLevelParameteriv_remap_index },
-   { 14307, GetTextureParameterIiv_remap_index },
-   { 22184, GetTextureParameterIuiv_remap_index },
-   { 24520, GetTextureParameterfv_remap_index },
-   { 27671, GetTextureParameteriv_remap_index },
-   { 21802, TextureBuffer_remap_index },
-   { 36525, TextureParameterIiv_remap_index },
-   { 27863, TextureParameterIuiv_remap_index },
-   { 35320, TextureParameterf_remap_index },
+   {  4684, GetNamedBufferParameteri64v_remap_index },
+   { 24193, GetNamedBufferParameteriv_remap_index },
+   { 29414, GetNamedBufferPointerv_remap_index },
+   { 11543, GetNamedBufferSubData_remap_index },
+   { 18354, GetTextureImage_remap_index },
+   { 34057, GetTextureLevelParameterfv_remap_index },
+   { 36780, GetTextureLevelParameteriv_remap_index },
+   { 14618, GetTextureParameterIiv_remap_index },
+   { 22543, GetTextureParameterIuiv_remap_index },
+   { 24916, GetTextureParameterfv_remap_index },
+   { 28049, GetTextureParameteriv_remap_index },
+   {  9609, MapNamedBuffer_remap_index },
+   { 12354, MapNamedBufferRange_remap_index },
+   { 44459, NamedBufferData_remap_index },
+   { 11082, NamedBufferStorage_remap_index },
+   { 18924, NamedBufferSubData_remap_index },
+   { 22161, TextureBuffer_remap_index },
+   { 11424, TextureBufferRange_remap_index },
+   { 36914, TextureParameterIiv_remap_index },
+   { 28241, TextureParameterIuiv_remap_index },
+   { 35709, TextureParameterf_remap_index },
    {  2202, TextureParameterfv_remap_index },
-   { 35401, TextureParameteri_remap_index },
-   { 24797, TextureParameteriv_remap_index },
-   { 10147, TextureStorage1D_remap_index },
-   { 14281, TextureStorage2D_remap_index },
-   { 41451, TextureStorage2DMultisample_remap_index },
-   { 18262, TextureStorage3D_remap_index },
-   {  3181, TextureStorage3DMultisample_remap_index },
-   { 26111, TextureSubImage1D_remap_index },
-   { 30577, TextureSubImage2D_remap_index },
-   { 33607, TextureSubImage3D_remap_index },
-   {  6537, InvalidateBufferData_remap_index },
-   { 40184, InvalidateBufferSubData_remap_index },
-   { 21921, InvalidateFramebuffer_remap_index },
-   { 16339, InvalidateSubFramebuffer_remap_index },
-   { 12238, InvalidateTexImage_remap_index },
-   { 26258, InvalidateTexSubImage_remap_index },
-   { 12999, PolygonOffsetEXT_remap_index },
-   { 37422, DrawTexfOES_remap_index },
-   { 25680, DrawTexfvOES_remap_index },
+   { 35790, TextureParameteri_remap_index },
+   { 25193, TextureParameteriv_remap_index },
+   { 10310, TextureStorage1D_remap_index },
+   { 14592, TextureStorage2D_remap_index },
+   { 41893, TextureStorage2DMultisample_remap_index },
+   { 18573, TextureStorage3D_remap_index },
+   {  3253, TextureStorage3DMultisample_remap_index },
+   { 26507, TextureSubImage1D_remap_index },
+   { 30985, TextureSubImage2D_remap_index },
+   { 33966, TextureSubImage3D_remap_index },
+   {  4447, UnmapNamedBuffer_remap_index },
+   {  6704, InvalidateBufferData_remap_index },
+   { 40591, InvalidateBufferSubData_remap_index },
+   { 22280, InvalidateFramebuffer_remap_index },
+   { 16650, InvalidateSubFramebuffer_remap_index },
+   { 12514, InvalidateTexImage_remap_index },
+   { 26654, InvalidateTexSubImage_remap_index },
+   { 13275, PolygonOffsetEXT_remap_index },
+   { 37811, DrawTexfOES_remap_index },
+   { 26076, DrawTexfvOES_remap_index },
    {  1013, DrawTexiOES_remap_index },
-   { 31008, DrawTexivOES_remap_index },
-   { 12385, DrawTexsOES_remap_index },
-   { 22115, DrawTexsvOES_remap_index },
-   { 26952, DrawTexxOES_remap_index },
-   { 39403, DrawTexxvOES_remap_index },
-   { 25085, PointSizePointerOES_remap_index },
+   { 31416, DrawTexivOES_remap_index },
+   { 12661, DrawTexsOES_remap_index },
+   { 22474, DrawTexsvOES_remap_index },
+   { 27348, DrawTexxOES_remap_index },
+   { 39810, DrawTexxvOES_remap_index },
+   { 25481, PointSizePointerOES_remap_index },
    {   976, QueryMatrixxOES_remap_index },
-   { 19718, SampleMaskSGIS_remap_index },
-   { 34080, SamplePatternSGIS_remap_index },
-   { 43312, ColorPointerEXT_remap_index },
-   { 28387, EdgeFlagPointerEXT_remap_index },
-   { 13076, IndexPointerEXT_remap_index },
-   { 13266, NormalPointerEXT_remap_index },
-   { 27783, TexCoordPointerEXT_remap_index },
-   { 24902, VertexPointerEXT_remap_index },
-   { 43234, DiscardFramebufferEXT_remap_index },
-   { 10936, ActiveShaderProgram_remap_index },
-   { 16597, BindProgramPipeline_remap_index },
-   { 28439, CreateShaderProgramv_remap_index },
-   {  3569, DeleteProgramPipelines_remap_index },
-   { 25903, GenProgramPipelines_remap_index },
-   {  8121, GetProgramPipelineInfoLog_remap_index },
-   { 31175, GetProgramPipelineiv_remap_index },
-   { 25966, IsProgramPipeline_remap_index },
-   { 45276, LockArraysEXT_remap_index },
-   { 44574, ProgramUniform1d_remap_index },
-   { 30705, ProgramUniform1dv_remap_index },
-   { 44528, ProgramUniform1f_remap_index },
-   {  9623, ProgramUniform1fv_remap_index },
-   { 44482, ProgramUniform1i_remap_index },
-   { 15143, ProgramUniform1iv_remap_index },
-   { 34530, ProgramUniform1ui_remap_index },
-   { 44330, ProgramUniform1uiv_remap_index },
+   { 20056, SampleMaskSGIS_remap_index },
+   { 34439, SamplePatternSGIS_remap_index },
+   { 43745, ColorPointerEXT_remap_index },
+   { 28765, EdgeFlagPointerEXT_remap_index },
+   { 13352, IndexPointerEXT_remap_index },
+   { 13542, NormalPointerEXT_remap_index },
+   { 28161, TexCoordPointerEXT_remap_index },
+   { 25298, VertexPointerEXT_remap_index },
+   { 43667, DiscardFramebufferEXT_remap_index },
+   { 11126, ActiveShaderProgram_remap_index },
+   { 16908, BindProgramPipeline_remap_index },
+   { 28817, CreateShaderProgramv_remap_index },
+   {  3641, DeleteProgramPipelines_remap_index },
+   { 26299, GenProgramPipelines_remap_index },
+   {  8288, GetProgramPipelineInfoLog_remap_index },
+   { 31583, GetProgramPipelineiv_remap_index },
+   { 26362, IsProgramPipeline_remap_index },
+   { 45733, LockArraysEXT_remap_index },
+   { 45031, ProgramUniform1d_remap_index },
+   { 31113, ProgramUniform1dv_remap_index },
+   { 44985, ProgramUniform1f_remap_index },
+   {  9786, ProgramUniform1fv_remap_index },
+   { 44939, ProgramUniform1i_remap_index },
+   { 15454, ProgramUniform1iv_remap_index },
+   { 34889, ProgramUniform1ui_remap_index },
+   { 44787, ProgramUniform1uiv_remap_index },
    {  2384, ProgramUniform2d_remap_index },
-   {  9552, ProgramUniform2dv_remap_index },
+   {  9715, ProgramUniform2dv_remap_index },
    {  2337, ProgramUniform2f_remap_index },
-   { 36342, ProgramUniform2fv_remap_index },
+   { 36731, ProgramUniform2fv_remap_index },
    {  2409, ProgramUniform2i_remap_index },
-   { 21309, ProgramUniform2iv_remap_index },
-   {  7124, ProgramUniform2ui_remap_index },
-   {  8990, ProgramUniform2uiv_remap_index },
-   {  4564, ProgramUniform3d_remap_index },
-   { 23232, ProgramUniform3dv_remap_index },
-   {  4590, ProgramUniform3f_remap_index },
-   { 30074, ProgramUniform3fv_remap_index },
-   {  4638, ProgramUniform3i_remap_index },
-   { 13291, ProgramUniform3iv_remap_index },
-   { 15192, ProgramUniform3ui_remap_index },
-   { 17992, ProgramUniform3uiv_remap_index },
-   { 28884, ProgramUniform4d_remap_index },
-   { 30928, ProgramUniform4dv_remap_index },
-   { 28911, ProgramUniform4f_remap_index },
-   { 33470, ProgramUniform4fv_remap_index },
-   { 28960, ProgramUniform4i_remap_index },
+   { 21668, ProgramUniform2iv_remap_index },
+   {  7291, ProgramUniform2ui_remap_index },
+   {  9132, ProgramUniform2uiv_remap_index },
+   {  4719, ProgramUniform3d_remap_index },
+   {  4658, ProgramUniform3dv_remap_index },
+   {  4745, ProgramUniform3f_remap_index },
+   { 30482, ProgramUniform3fv_remap_index },
+   {  4793, ProgramUniform3i_remap_index },
+   { 13567, ProgramUniform3iv_remap_index },
+   { 15503, ProgramUniform3ui_remap_index },
+   { 18303, ProgramUniform3uiv_remap_index },
+   { 29262, ProgramUniform4d_remap_index },
+   { 31336, ProgramUniform4dv_remap_index },
+   { 29289, ProgramUniform4f_remap_index },
+   { 42550, ProgramUniform4fv_remap_index },
+   { 29338, ProgramUniform4i_remap_index },
    {  1910, ProgramUniform4iv_remap_index },
-   { 40831, ProgramUniform4ui_remap_index },
-   { 33230, ProgramUniform4uiv_remap_index },
-   { 13340, ProgramUniformMatrix2dv_remap_index },
-   { 19790, ProgramUniformMatrix2fv_remap_index },
-   { 16036, ProgramUniformMatrix2x3dv_remap_index },
-   { 22255, ProgramUniformMatrix2x3fv_remap_index },
+   { 41238, ProgramUniform4ui_remap_index },
+   { 33638, ProgramUniform4uiv_remap_index },
+   { 13616, ProgramUniformMatrix2dv_remap_index },
+   { 20128, ProgramUniformMatrix2fv_remap_index },
+   { 16347, ProgramUniformMatrix2x3dv_remap_index },
+   { 22614, ProgramUniformMatrix2x3fv_remap_index },
    {  1842, ProgramUniformMatrix2x4dv_remap_index },
-   {  7803, ProgramUniformMatrix2x4fv_remap_index },
-   { 45243, ProgramUniformMatrix3dv_remap_index },
-   { 39026, ProgramUniformMatrix3fv_remap_index },
-   { 26796, ProgramUniformMatrix3x2dv_remap_index },
-   { 34288, ProgramUniformMatrix3x2fv_remap_index },
-   { 22701, ProgramUniformMatrix3x4dv_remap_index },
-   { 27383, ProgramUniformMatrix3x4fv_remap_index },
-   { 39213, ProgramUniformMatrix4dv_remap_index },
-   { 32399, ProgramUniformMatrix4fv_remap_index },
-   { 40375, ProgramUniformMatrix4x2dv_remap_index },
+   {  7970, ProgramUniformMatrix2x4fv_remap_index },
+   { 45700, ProgramUniformMatrix3dv_remap_index },
+   { 39433, ProgramUniformMatrix3fv_remap_index },
+   { 27192, ProgramUniformMatrix3x2dv_remap_index },
+   { 34647, ProgramUniformMatrix3x2fv_remap_index },
+   { 23060, ProgramUniformMatrix3x4dv_remap_index },
+   { 27761, ProgramUniformMatrix3x4fv_remap_index },
+   { 39620, ProgramUniformMatrix4dv_remap_index },
+   { 32807, ProgramUniformMatrix4fv_remap_index },
+   { 40782, ProgramUniformMatrix4x2dv_remap_index },
    {  2271, ProgramUniformMatrix4x2fv_remap_index },
-   { 13898, ProgramUniformMatrix4x3dv_remap_index },
-   {  7367, ProgramUniformMatrix4x3fv_remap_index },
-   { 39797, UnlockArraysEXT_remap_index },
-   { 32353, UseProgramStages_remap_index },
+   { 14174, ProgramUniformMatrix4x3dv_remap_index },
+   {  7534, ProgramUniformMatrix4x3fv_remap_index },
+   { 40204, UnlockArraysEXT_remap_index },
+   { 32761, UseProgramStages_remap_index },
    {  1655, ValidateProgramPipeline_remap_index },
-   { 16673, DebugMessageCallback_remap_index },
-   { 32842, DebugMessageControl_remap_index },
-   { 15874, DebugMessageInsert_remap_index },
-   {  6927, GetDebugMessageLog_remap_index },
-   {  6718, GetObjectLabel_remap_index },
-   { 12406, GetObjectPtrLabel_remap_index },
-   { 31783, ObjectLabel_remap_index },
-   { 45363, ObjectPtrLabel_remap_index },
-   { 18496, PopDebugGroup_remap_index },
-   { 14673, PushDebugGroup_remap_index },
-   {  8510, SecondaryColor3fEXT_remap_index },
-   {  7999, SecondaryColor3fvEXT_remap_index },
-   { 29743, MultiDrawElementsEXT_remap_index },
-   { 11068, FogCoordfEXT_remap_index },
-   { 18740, FogCoordfvEXT_remap_index },
-   {  4266, ResizeBuffersMESA_remap_index },
-   { 35504, WindowPos4dMESA_remap_index },
-   { 28284, WindowPos4dvMESA_remap_index },
-   {  4402, WindowPos4fMESA_remap_index },
-   { 11647, WindowPos4fvMESA_remap_index },
-   {  9280, WindowPos4iMESA_remap_index },
-   {  3744, WindowPos4ivMESA_remap_index },
-   { 29080, WindowPos4sMESA_remap_index },
+   { 16984, DebugMessageCallback_remap_index },
+   { 33250, DebugMessageControl_remap_index },
+   { 16185, DebugMessageInsert_remap_index },
+   {  7094, GetDebugMessageLog_remap_index },
+   {  6885, GetObjectLabel_remap_index },
+   { 12682, GetObjectPtrLabel_remap_index },
+   { 32191, ObjectLabel_remap_index },
+   { 45820, ObjectPtrLabel_remap_index },
+   { 18807, PopDebugGroup_remap_index },
+   { 14984, PushDebugGroup_remap_index },
+   {  8652, SecondaryColor3fEXT_remap_index },
+   {  8166, SecondaryColor3fvEXT_remap_index },
+   { 30151, MultiDrawElementsEXT_remap_index },
+   { 11258, FogCoordfEXT_remap_index },
+   { 19078, FogCoordfvEXT_remap_index },
+   {  4338, ResizeBuffersMESA_remap_index },
+   { 35893, WindowPos4dMESA_remap_index },
+   { 28662, WindowPos4dvMESA_remap_index },
+   {  4496, WindowPos4fMESA_remap_index },
+   { 11895, WindowPos4fvMESA_remap_index },
+   {  9422, WindowPos4iMESA_remap_index },
+   {  3816, WindowPos4ivMESA_remap_index },
+   { 29488, WindowPos4sMESA_remap_index },
    {  1107, WindowPos4svMESA_remap_index },
-   { 29843, MultiModeDrawArraysIBM_remap_index },
-   { 20470, MultiModeDrawElementsIBM_remap_index },
-   { 34199, AreProgramsResidentNV_remap_index },
-   { 41579, ExecuteProgramNV_remap_index },
-   { 30673, GetProgramParameterdvNV_remap_index },
-   { 38037, GetProgramParameterfvNV_remap_index },
-   { 19887, GetProgramStringNV_remap_index },
-   { 16263, GetProgramivNV_remap_index },
-   { 19025, GetTrackMatrixivNV_remap_index },
-   { 19467, GetVertexAttribdvNV_remap_index },
-   { 17619, GetVertexAttribfvNV_remap_index },
-   { 16490, GetVertexAttribivNV_remap_index },
-   { 37760, LoadProgramNV_remap_index },
-   { 20570, ProgramParameters4dvNV_remap_index },
-   { 21182, ProgramParameters4fvNV_remap_index },
-   {  6319, RequestResidentProgramsNV_remap_index },
-   { 30229, TrackMatrixNV_remap_index },
-   { 45650, VertexAttrib1dNV_remap_index },
-   { 29148, VertexAttrib1dvNV_remap_index },
-   { 29514, VertexAttrib1fNV_remap_index },
-   { 43661, VertexAttrib1fvNV_remap_index },
-   { 21759, VertexAttrib1sNV_remap_index },
-   { 39817, VertexAttrib1svNV_remap_index },
-   { 19001, VertexAttrib2dNV_remap_index },
-   { 35788, VertexAttrib2dvNV_remap_index },
-   { 28168, VertexAttrib2fNV_remap_index },
-   { 26831, VertexAttrib2fvNV_remap_index },
-   { 13172, VertexAttrib2sNV_remap_index },
-   {  5824, VertexAttrib2svNV_remap_index },
-   { 38446, VertexAttrib3dNV_remap_index },
-   { 40484, VertexAttrib3dvNV_remap_index },
-   {  5083, VertexAttrib3fNV_remap_index },
-   { 42882, VertexAttrib3fvNV_remap_index },
-   {  7311, VertexAttrib3sNV_remap_index },
-   { 19052, VertexAttrib3svNV_remap_index },
-   {  8712, VertexAttrib4dNV_remap_index },
-   {  3494, VertexAttrib4dvNV_remap_index },
-   {  8783, VertexAttrib4fNV_remap_index },
-   { 43036, VertexAttrib4fvNV_remap_index },
-   { 18104, VertexAttrib4sNV_remap_index },
-   { 11252, VertexAttrib4svNV_remap_index },
+   { 30251, MultiModeDrawArraysIBM_remap_index },
+   { 20808, MultiModeDrawElementsIBM_remap_index },
+   { 34558, AreProgramsResidentNV_remap_index },
+   { 42021, ExecuteProgramNV_remap_index },
+   { 31081, GetProgramParameterdvNV_remap_index },
+   { 38444, GetProgramParameterfvNV_remap_index },
+   { 20225, GetProgramStringNV_remap_index },
+   { 16574, GetProgramivNV_remap_index },
+   { 19363, GetTrackMatrixivNV_remap_index },
+   { 19805, GetVertexAttribdvNV_remap_index },
+   { 17930, GetVertexAttribfvNV_remap_index },
+   { 16801, GetVertexAttribivNV_remap_index },
+   { 38167, LoadProgramNV_remap_index },
+   { 20908, ProgramParameters4dvNV_remap_index },
+   { 21520, ProgramParameters4fvNV_remap_index },
+   {  6486, RequestResidentProgramsNV_remap_index },
+   { 30637, TrackMatrixNV_remap_index },
+   { 46107, VertexAttrib1dNV_remap_index },
+   { 29556, VertexAttrib1dvNV_remap_index },
+   { 29922, VertexAttrib1fNV_remap_index },
+   { 44094, VertexAttrib1fvNV_remap_index },
+   { 22118, VertexAttrib1sNV_remap_index },
+   { 40224, VertexAttrib1svNV_remap_index },
+   { 19339, VertexAttrib2dNV_remap_index },
+   { 36177, VertexAttrib2dvNV_remap_index },
+   { 28546, VertexAttrib2fNV_remap_index },
+   { 27227, VertexAttrib2fvNV_remap_index },
+   { 13448, VertexAttrib2sNV_remap_index },
+   {  5991, VertexAttrib2svNV_remap_index },
+   { 38853, VertexAttrib3dNV_remap_index },
+   { 40891, VertexAttrib3dvNV_remap_index },
+   {  5238, VertexAttrib3fNV_remap_index },
+   { 43315, VertexAttrib3fvNV_remap_index },
+   {  7478, VertexAttrib3sNV_remap_index },
+   { 19390, VertexAttrib3svNV_remap_index },
+   {  8854, VertexAttrib4dNV_remap_index },
+   {  3566, VertexAttrib4dvNV_remap_index },
+   {  8925, VertexAttrib4fNV_remap_index },
+   { 43469, VertexAttrib4fvNV_remap_index },
+   { 18415, VertexAttrib4sNV_remap_index },
+   { 11470, VertexAttrib4svNV_remap_index },
    {  1628, VertexAttrib4ubNV_remap_index },
-   { 11043, VertexAttrib4ubvNV_remap_index },
-   { 29994, VertexAttribPointerNV_remap_index },
-   { 28335, VertexAttribs1dvNV_remap_index },
-   { 32101, VertexAttribs1fvNV_remap_index },
-   {  6293, VertexAttribs1svNV_remap_index },
-   { 44304, VertexAttribs2dvNV_remap_index },
-   {  4426, VertexAttribs2fvNV_remap_index },
-   { 28413, VertexAttribs2svNV_remap_index },
+   { 11233, VertexAttrib4ubvNV_remap_index },
+   { 30402, VertexAttribPointerNV_remap_index },
+   { 28713, VertexAttribs1dvNV_remap_index },
+   { 32509, VertexAttribs1fvNV_remap_index },
+   {  6460, VertexAttribs1svNV_remap_index },
+   { 44761, VertexAttribs2dvNV_remap_index },
+   {  4520, VertexAttribs2fvNV_remap_index },
+   { 28791, VertexAttribs2svNV_remap_index },
    {  1816, VertexAttribs3dvNV_remap_index },
-   { 37029, VertexAttribs3fvNV_remap_index },
-   { 14458, VertexAttribs3svNV_remap_index },
-   { 25654, VertexAttribs4dvNV_remap_index },
-   { 25236, VertexAttribs4fvNV_remap_index },
-   { 21358, VertexAttribs4svNV_remap_index },
-   { 33425, VertexAttribs4ubvNV_remap_index },
-   { 43539, GetTexBumpParameterfvATI_remap_index },
-   { 10794, GetTexBumpParameterivATI_remap_index },
-   { 37129, TexBumpParameterfvATI_remap_index },
-   {  8755, TexBumpParameterivATI_remap_index },
-   {  9480, AlphaFragmentOp1ATI_remap_index },
-   {  3518, AlphaFragmentOp2ATI_remap_index },
-   {  9962, AlphaFragmentOp3ATI_remap_index },
-   { 34721, BeginFragmentShaderATI_remap_index },
-   {  3791, BindFragmentShaderATI_remap_index },
-   {  7336, ColorFragmentOp1ATI_remap_index },
-   { 13138, ColorFragmentOp2ATI_remap_index },
-   { 24823, ColorFragmentOp3ATI_remap_index },
-   { 17434, DeleteFragmentShaderATI_remap_index },
-   { 45793, EndFragmentShaderATI_remap_index },
-   { 23803, GenFragmentShadersATI_remap_index },
-   { 43118, PassTexCoordATI_remap_index },
-   { 37109, SampleMapATI_remap_index },
-   { 36290, SetFragmentShaderConstantATI_remap_index },
-   {  8686, ActiveStencilFaceEXT_remap_index },
-   {  8312, BindVertexArrayAPPLE_remap_index },
-   { 16939, GenVertexArraysAPPLE_remap_index },
-   { 36695, GetProgramNamedParameterdvNV_remap_index },
-   { 23553, GetProgramNamedParameterfvNV_remap_index },
-   { 43570, ProgramNamedParameter4dNV_remap_index },
-   { 39608, ProgramNamedParameter4dvNV_remap_index },
-   { 42824, ProgramNamedParameter4fNV_remap_index },
-   { 26358, ProgramNamedParameter4fvNV_remap_index },
-   { 25143, PrimitiveRestartNV_remap_index },
-   { 25632, GetTexGenxvOES_remap_index },
-   { 15028, TexGenxOES_remap_index },
-   { 33679, TexGenxvOES_remap_index },
-   {  8236, DepthBoundsEXT_remap_index },
-   {  6063, BindFramebufferEXT_remap_index },
-   { 43176, BindRenderbufferEXT_remap_index },
-   { 32258, BufferParameteriAPPLE_remap_index },
-   { 41123, FlushMappedBufferRangeAPPLE_remap_index },
-   { 28703, VertexAttribI1iEXT_remap_index },
-   { 11586, VertexAttribI1uiEXT_remap_index },
-   { 20903, VertexAttribI2iEXT_remap_index },
-   { 42675, VertexAttribI2ivEXT_remap_index },
-   { 26489, VertexAttribI2uiEXT_remap_index },
-   { 36792, VertexAttribI2uivEXT_remap_index },
-   { 19986, VertexAttribI3iEXT_remap_index },
-   { 44802, VertexAttribI3ivEXT_remap_index },
-   { 23485, VertexAttribI3uiEXT_remap_index },
-   { 21663, VertexAttribI3uivEXT_remap_index },
-   { 39653, VertexAttribI4iEXT_remap_index },
-   {  6834, VertexAttribI4ivEXT_remap_index },
+   { 37418, VertexAttribs3fvNV_remap_index },
+   { 14769, VertexAttribs3svNV_remap_index },
+   { 26050, VertexAttribs4dvNV_remap_index },
+   { 25632, VertexAttribs4fvNV_remap_index },
+   { 21717, VertexAttribs4svNV_remap_index },
+   { 33833, VertexAttribs4ubvNV_remap_index },
+   { 43972, GetTexBumpParameterfvATI_remap_index },
+   { 10957, GetTexBumpParameterivATI_remap_index },
+   { 37518, TexBumpParameterfvATI_remap_index },
+   {  8897, TexBumpParameterivATI_remap_index },
+   {  9643, AlphaFragmentOp1ATI_remap_index },
+   {  3590, AlphaFragmentOp2ATI_remap_index },
+   { 10125, AlphaFragmentOp3ATI_remap_index },
+   { 35077, BeginFragmentShaderATI_remap_index },
+   {  3863, BindFragmentShaderATI_remap_index },
+   {  7503, ColorFragmentOp1ATI_remap_index },
+   { 13414, ColorFragmentOp2ATI_remap_index },
+   { 25219, ColorFragmentOp3ATI_remap_index },
+   { 17745, DeleteFragmentShaderATI_remap_index },
+   { 46250, EndFragmentShaderATI_remap_index },
+   { 24166, GenFragmentShadersATI_remap_index },
+   { 43551, PassTexCoordATI_remap_index },
+   { 37498, SampleMapATI_remap_index },
+   { 36679, SetFragmentShaderConstantATI_remap_index },
+   {  8828, ActiveStencilFaceEXT_remap_index },
+   {  8454, BindVertexArrayAPPLE_remap_index },
+   { 17250, GenVertexArraysAPPLE_remap_index },
+   { 37084, GetProgramNamedParameterdvNV_remap_index },
+   { 23916, GetProgramNamedParameterfvNV_remap_index },
+   { 44003, ProgramNamedParameter4dNV_remap_index },
+   { 40015, ProgramNamedParameter4dvNV_remap_index },
+   { 43257, ProgramNamedParameter4fNV_remap_index },
+   { 26754, ProgramNamedParameter4fvNV_remap_index },
+   { 25539, PrimitiveRestartNV_remap_index },
+   { 26028, GetTexGenxvOES_remap_index },
+   { 15339, TexGenxOES_remap_index },
+   { 34038, TexGenxvOES_remap_index },
+   {  8378, DepthBoundsEXT_remap_index },
+   {  6230, BindFramebufferEXT_remap_index },
+   { 43609, BindRenderbufferEXT_remap_index },
+   { 32666, BufferParameteriAPPLE_remap_index },
+   { 41530, FlushMappedBufferRangeAPPLE_remap_index },
+   { 29081, VertexAttribI1iEXT_remap_index },
+   { 11834, VertexAttribI1uiEXT_remap_index },
+   { 21241, VertexAttribI2iEXT_remap_index },
+   { 43108, VertexAttribI2ivEXT_remap_index },
+   { 26885, VertexAttribI2uiEXT_remap_index },
+   { 37181, VertexAttribI2uivEXT_remap_index },
+   { 20324, VertexAttribI3iEXT_remap_index },
+   { 45259, VertexAttribI3ivEXT_remap_index },
+   { 23848, VertexAttribI3uiEXT_remap_index },
+   { 22022, VertexAttribI3uivEXT_remap_index },
+   { 40060, VertexAttribI4iEXT_remap_index },
+   {  7001, VertexAttribI4ivEXT_remap_index },
    {  2632, VertexAttribI4uiEXT_remap_index },
-   { 28560, VertexAttribI4uivEXT_remap_index },
-   {  3058, ClearColorIiEXT_remap_index },
+   { 28938, VertexAttribI4uivEXT_remap_index },
+   {  3130, ClearColorIiEXT_remap_index },
    {  1235, ClearColorIuiEXT_remap_index },
-   { 25166, BindBufferOffsetEXT_remap_index },
-   { 18772, BeginPerfMonitorAMD_remap_index },
-   { 34157, DeletePerfMonitorsAMD_remap_index },
-   {  5576, EndPerfMonitorAMD_remap_index },
-   { 38820, GenPerfMonitorsAMD_remap_index },
-   { 12864, GetPerfMonitorCounterDataAMD_remap_index },
-   { 36122, GetPerfMonitorCounterInfoAMD_remap_index },
-   { 45753, GetPerfMonitorCounterStringAMD_remap_index },
-   { 45328, GetPerfMonitorCountersAMD_remap_index },
-   { 14744, GetPerfMonitorGroupStringAMD_remap_index },
-   { 30852, GetPerfMonitorGroupsAMD_remap_index },
-   { 14243, SelectPerfMonitorCountersAMD_remap_index },
-   { 14841, GetObjectParameterivAPPLE_remap_index },
-   { 45136, ObjectPurgeableAPPLE_remap_index },
+   { 25562, BindBufferOffsetEXT_remap_index },
+   { 19110, BeginPerfMonitorAMD_remap_index },
+   { 34516, DeletePerfMonitorsAMD_remap_index },
+   {  5731, EndPerfMonitorAMD_remap_index },
+   { 39227, GenPerfMonitorsAMD_remap_index },
+   { 13140, GetPerfMonitorCounterDataAMD_remap_index },
+   { 36511, GetPerfMonitorCounterInfoAMD_remap_index },
+   { 46210, GetPerfMonitorCounterStringAMD_remap_index },
+   { 45785, GetPerfMonitorCountersAMD_remap_index },
+   { 15055, GetPerfMonitorGroupStringAMD_remap_index },
+   { 31260, GetPerfMonitorGroupsAMD_remap_index },
+   { 14554, SelectPerfMonitorCountersAMD_remap_index },
+   { 15152, GetObjectParameterivAPPLE_remap_index },
+   { 45593, ObjectPurgeableAPPLE_remap_index },
    {  1959, ObjectUnpurgeableAPPLE_remap_index },
-   { 44092, ActiveProgramEXT_remap_index },
-   { 28306, CreateShaderProgramEXT_remap_index },
-   { 38554, UseShaderProgramEXT_remap_index },
-   { 31649, TextureBarrierNV_remap_index },
+   { 44549, ActiveProgramEXT_remap_index },
+   { 28684, CreateShaderProgramEXT_remap_index },
+   { 38961, UseShaderProgramEXT_remap_index },
+   { 32057, TextureBarrierNV_remap_index },
    {  2228, VDPAUFiniNV_remap_index },
    {   869, VDPAUGetSurfaceivNV_remap_index },
-   { 24678, VDPAUInitNV_remap_index },
-   { 22233, VDPAUIsSurfaceNV_remap_index },
-   {  6583, VDPAUMapSurfacesNV_remap_index },
-   {  3099, VDPAURegisterOutputSurfaceNV_remap_index },
-   { 12762, VDPAURegisterVideoSurfaceNV_remap_index },
-   { 11325, VDPAUSurfaceAccessNV_remap_index },
-   {  4877, VDPAUUnmapSurfacesNV_remap_index },
-   { 39507, VDPAUUnregisterSurfaceNV_remap_index },
-   { 40285, BeginPerfQueryINTEL_remap_index },
-   { 35042, CreatePerfQueryINTEL_remap_index },
-   { 16870, DeletePerfQueryINTEL_remap_index },
-   { 42505, EndPerfQueryINTEL_remap_index },
-   { 44062, GetFirstPerfQueryIdINTEL_remap_index },
-   { 31602, GetNextPerfQueryIdINTEL_remap_index },
-   { 33281, GetPerfCounterInfoINTEL_remap_index },
+   { 25074, VDPAUInitNV_remap_index },
+   { 22592, VDPAUIsSurfaceNV_remap_index },
+   {  6750, VDPAUMapSurfacesNV_remap_index },
+   {  3171, VDPAURegisterOutputSurfaceNV_remap_index },
+   { 13038, VDPAURegisterVideoSurfaceNV_remap_index },
+   { 11573, VDPAUSurfaceAccessNV_remap_index },
+   {  5032, VDPAUUnmapSurfacesNV_remap_index },
+   { 39914, VDPAUUnregisterSurfaceNV_remap_index },
+   { 40692, BeginPerfQueryINTEL_remap_index },
+   { 35398, CreatePerfQueryINTEL_remap_index },
+   { 17181, DeletePerfQueryINTEL_remap_index },
+   { 42938, EndPerfQueryINTEL_remap_index },
+   { 44519, GetFirstPerfQueryIdINTEL_remap_index },
+   { 32010, GetNextPerfQueryIdINTEL_remap_index },
+   { 33689, GetPerfCounterInfoINTEL_remap_index },
    {   780, GetPerfQueryDataINTEL_remap_index },
-   { 23087, GetPerfQueryIdByNameINTEL_remap_index },
-   { 20664, GetPerfQueryInfoINTEL_remap_index },
-   { 39961, PolygonOffsetClampEXT_remap_index },
-   { 21065, StencilFuncSeparateATI_remap_index },
-   {  5789, ProgramEnvParameters4fvEXT_remap_index },
-   { 31917, ProgramLocalParameters4fvEXT_remap_index },
-   {  3932, EGLImageTargetRenderbufferStorageOES_remap_index },
-   {  3696, EGLImageTargetTexture2DOES_remap_index },
-   { 42642, AlphaFuncx_remap_index },
-   { 20031, ClearColorx_remap_index },
-   { 41849, ClearDepthx_remap_index },
-   { 37528, Color4x_remap_index },
-   { 24616, DepthRangex_remap_index },
+   { 23446, GetPerfQueryIdByNameINTEL_remap_index },
+   { 21002, GetPerfQueryInfoINTEL_remap_index },
+   { 40368, PolygonOffsetClampEXT_remap_index },
+   { 21403, StencilFuncSeparateATI_remap_index },
+   {  5956, ProgramEnvParameters4fvEXT_remap_index },
+   { 32325, ProgramLocalParameters4fvEXT_remap_index },
+   {  4004, EGLImageTargetRenderbufferStorageOES_remap_index },
+   {  3768, EGLImageTargetTexture2DOES_remap_index },
+   { 43075, AlphaFuncx_remap_index },
+   { 20369, ClearColorx_remap_index },
+   { 42291, ClearDepthx_remap_index },
+   { 37917, Color4x_remap_index },
+   { 25012, DepthRangex_remap_index },
    {  2456, Fogx_remap_index },
-   { 15307, Fogxv_remap_index },
-   {  8957, Frustumf_remap_index },
-   {  9054, Frustumx_remap_index },
-   { 19951, LightModelx_remap_index },
-   { 33519, LightModelxv_remap_index },
-   { 30048, Lightx_remap_index },
-   { 43422, Lightxv_remap_index },
-   {  3626, LineWidthx_remap_index },
-   {  3383, LoadMatrixx_remap_index },
-   { 44399, Materialx_remap_index },
-   { 26308, Materialxv_remap_index },
-   { 44921, MultMatrixx_remap_index },
-   { 10425, MultiTexCoord4x_remap_index },
-   { 26140, Normal3x_remap_index },
-   { 15927, Orthof_remap_index },
-   { 16143, Orthox_remap_index },
-   { 28607, PointSizex_remap_index },
+   { 15618, Fogxv_remap_index },
+   {  9099, Frustumf_remap_index },
+   {  9196, Frustumx_remap_index },
+   { 20289, LightModelx_remap_index },
+   { 33878, LightModelxv_remap_index },
+   { 30456, Lightx_remap_index },
+   { 43855, Lightxv_remap_index },
+   {  3698, LineWidthx_remap_index },
+   {  3455, LoadMatrixx_remap_index },
+   { 44856, Materialx_remap_index },
+   { 26704, Materialxv_remap_index },
+   { 45378, MultMatrixx_remap_index },
+   { 10588, MultiTexCoord4x_remap_index },
+   { 26536, Normal3x_remap_index },
+   { 16238, Orthof_remap_index },
+   { 16454, Orthox_remap_index },
+   { 28985, PointSizex_remap_index },
    {    70, PolygonOffsetx_remap_index },
-   { 38890, Rotatex_remap_index },
-   { 20621, SampleCoveragex_remap_index },
-   { 13022, Scalex_remap_index },
-   { 40075, TexEnvx_remap_index },
-   { 45087, TexEnvxv_remap_index },
+   { 39297, Rotatex_remap_index },
+   { 20959, SampleCoveragex_remap_index },
+   { 13298, Scalex_remap_index },
+   { 40482, TexEnvx_remap_index },
+   { 45544, TexEnvxv_remap_index },
    {  2038, TexParameterx_remap_index },
-   { 32983, Translatex_remap_index },
-   { 34497, ClipPlanef_remap_index },
-   { 34399, ClipPlanex_remap_index },
+   { 33391, Translatex_remap_index },
+   { 34856, ClipPlanef_remap_index },
+   { 34758, ClipPlanex_remap_index },
    {   741, GetClipPlanef_remap_index },
    {   604, GetClipPlanex_remap_index },
-   { 20539, GetFixedv_remap_index },
+   { 20877, GetFixedv_remap_index },
    {  1294, GetLightxv_remap_index },
-   { 23590, GetMaterialxv_remap_index },
-   { 22079, GetTexEnvxv_remap_index },
-   { 17319, GetTexParameterxv_remap_index },
-   { 30301, PointParameterx_remap_index },
-   { 38845, PointParameterxv_remap_index },
-   { 19676, TexParameterxv_remap_index },
+   { 23953, GetMaterialxv_remap_index },
+   { 22438, GetTexEnvxv_remap_index },
+   { 17630, GetTexParameterxv_remap_index },
+   { 30709, PointParameterx_remap_index },
+   { 39252, PointParameterxv_remap_index },
+   { 20014, TexParameterxv_remap_index },
    {    -1, -1 }
 };
 
 /* these functions are in the ABI, but have alternative names */
 static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
-   { 35736, _gloffset_BlendColor },
+   { 36125, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 38389, _gloffset_BlendEquation },
+   { 38796, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   {  5533, _gloffset_ColorSubTable },
-   { 21980, _gloffset_CopyColorSubTable },
+   {  5688, _gloffset_ColorSubTable },
+   { 22339, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
    {  1328, _gloffset_GetConvolutionParameteriv },
-   { 14086, _gloffset_ConvolutionParameterfv },
-   { 17156, _gloffset_CopyConvolutionFilter1D },
-   { 19188, _gloffset_SeparableFilter2D },
-   { 20415, _gloffset_GetConvolutionFilter },
-   { 24319, _gloffset_ConvolutionFilter1D },
-   { 26696, _gloffset_ConvolutionFilter2D },
-   { 29601, _gloffset_GetSeparableFilter },
-   { 31260, _gloffset_ConvolutionParameteri },
-   { 31382, _gloffset_ConvolutionParameterf },
-   { 37557, _gloffset_ConvolutionParameteriv },
-   { 43475, _gloffset_GetConvolutionParameterfv },
-   { 44653, _gloffset_CopyConvolutionFilter2D },
+   { 14362, _gloffset_ConvolutionParameterfv },
+   { 17467, _gloffset_CopyConvolutionFilter1D },
+   { 19526, _gloffset_SeparableFilter2D },
+   { 20753, _gloffset_GetConvolutionFilter },
+   { 24715, _gloffset_ConvolutionFilter1D },
+   { 27092, _gloffset_ConvolutionFilter2D },
+   { 30009, _gloffset_GetSeparableFilter },
+   { 31668, _gloffset_ConvolutionParameteri },
+   { 31790, _gloffset_ConvolutionParameterf },
+   { 37946, _gloffset_ConvolutionParameteriv },
+   { 43908, _gloffset_GetConvolutionParameterfv },
+   { 45110, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 28222, _gloffset_CopyTexImage2D },
-   { 31026, _gloffset_CopyTexImage1D },
-   { 33556, _gloffset_CopyTexSubImage1D },
-   { 39884, _gloffset_CopyTexSubImage3D },
-   { 43731, _gloffset_CopyTexSubImage2D },
+   { 28600, _gloffset_CopyTexImage2D },
+   { 31434, _gloffset_CopyTexImage1D },
+   { 33915, _gloffset_CopyTexSubImage1D },
+   { 40291, _gloffset_CopyTexSubImage3D },
+   { 44164, _gloffset_CopyTexSubImage2D },
    /* from GL_EXT_draw_range_elements */
-   { 25581, _gloffset_DrawRangeElements },
+   { 25977, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
-   {  4776, _gloffset_GetHistogramParameterfv },
-   {  8338, _gloffset_GetHistogramParameteriv },
-   {  9746, _gloffset_Minmax },
-   { 14398, _gloffset_GetMinmax },
-   { 22604, _gloffset_Histogram },
-   { 30954, _gloffset_GetMinmaxParameteriv },
-   { 31954, _gloffset_ResetMinmax },
-   { 32943, _gloffset_GetHistogram },
-   { 34815, _gloffset_GetMinmaxParameterfv },
-   { 35812, _gloffset_ResetHistogram },
+   {  4931, _gloffset_GetHistogramParameterfv },
+   {  8480, _gloffset_GetHistogramParameteriv },
+   {  9909, _gloffset_Minmax },
+   { 14709, _gloffset_GetMinmax },
+   { 22963, _gloffset_Histogram },
+   { 31362, _gloffset_GetMinmaxParameteriv },
+   { 32362, _gloffset_ResetMinmax },
+   { 33351, _gloffset_GetHistogram },
+   { 35171, _gloffset_GetMinmaxParameterfv },
+   { 36201, _gloffset_ResetHistogram },
    /* from GL_EXT_paletted_texture */
-   { 13948, _gloffset_ColorTable },
-   { 18797, _gloffset_GetColorTableParameterfv },
-   { 27513, _gloffset_GetColorTable },
-   { 31438, _gloffset_GetColorTableParameteriv },
+   { 14224, _gloffset_ColorTable },
+   { 19135, _gloffset_GetColorTableParameterfv },
+   { 27891, _gloffset_GetColorTable },
+   { 31846, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
    {  2488, _gloffset_TexSubImage1D },
-   { 38104, _gloffset_TexSubImage2D },
+   { 38511, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   { 23030, _gloffset_TexImage3D },
-   { 42316, _gloffset_TexSubImage3D },
+   { 23389, _gloffset_TexImage3D },
+   { 42749, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  4312, _gloffset_GenTextures },
-   {  9101, _gloffset_BindTexture },
-   { 17962, _gloffset_IsTexture },
-   { 23435, _gloffset_PrioritizeTextures },
-   { 27742, _gloffset_DeleteTextures },
-   { 42772, _gloffset_AreTexturesResident },
+   {  4384, _gloffset_GenTextures },
+   {  9243, _gloffset_BindTexture },
+   { 18273, _gloffset_IsTexture },
+   { 23798, _gloffset_PrioritizeTextures },
+   { 28120, _gloffset_DeleteTextures },
+   { 43205, _gloffset_AreTexturesResident },
    /* from GL_EXT_vertex_array */
-   { 19286, _gloffset_ArrayElement },
-   { 30344, _gloffset_DrawArrays },
-   { 40567, _gloffset_GetPointerv },
+   { 19624, _gloffset_ArrayElement },
+   { 30752, _gloffset_DrawArrays },
+   { 40974, _gloffset_GetPointerv },
    /* from GL_NV_read_buffer */
-   { 31229, _gloffset_ReadBuffer },
+   { 31637, _gloffset_ReadBuffer },
    /* from GL_OES_blend_subtract */
-   { 38389, _gloffset_BlendEquation },
+   { 38796, _gloffset_BlendEquation },
    /* from GL_OES_texture_3D */
-   { 23030, _gloffset_TexImage3D },
-   { 39884, _gloffset_CopyTexSubImage3D },
-   { 42316, _gloffset_TexSubImage3D },
+   { 23389, _gloffset_TexImage3D },
+   { 40291, _gloffset_CopyTexSubImage3D },
+   { 42749, _gloffset_TexSubImage3D },
    /* from GL_OES_texture_cube_map */
-   { 17548, _gloffset_TexGeni },
-   { 17576, _gloffset_TexGenf },
-   { 20981, _gloffset_GetTexGenfv },
-   { 35687, _gloffset_TexGeniv },
-   { 38213, _gloffset_TexGenfv },
-   { 44026, _gloffset_GetTexGeniv },
+   { 17859, _gloffset_TexGeni },
+   { 17887, _gloffset_TexGenf },
+   { 21319, _gloffset_GetTexGenfv },
+   { 36076, _gloffset_TexGeniv },
+   { 38620, _gloffset_TexGenfv },
+   { 44483, _gloffset_GetTexGeniv },
    /* from GL_SGI_color_table */
    {  2792, _gloffset_ColorTableParameteriv },
-   { 13948, _gloffset_ColorTable },
-   { 17906, _gloffset_ColorTableParameterfv },
-   { 18797, _gloffset_GetColorTableParameterfv },
-   { 27513, _gloffset_GetColorTable },
-   { 27591, _gloffset_CopyColorTable },
-   { 31438, _gloffset_GetColorTableParameteriv },
+   { 14224, _gloffset_ColorTable },
+   { 18217, _gloffset_ColorTableParameterfv },
+   { 19135, _gloffset_GetColorTableParameterfv },
+   { 27891, _gloffset_GetColorTable },
+   { 27969, _gloffset_CopyColorTable },
+   { 31846, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 
diff --git a/xorg-server/glx/util/macros.h b/xorg-server/glx/util/macros.h
new file mode 100644
index 000000000..6c7bda7ae
--- /dev/null
+++ b/xorg-server/glx/util/macros.h
@@ -0,0 +1,186 @@
+/*
+ * Copyright © 2014 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef UTIL_MACROS_H
+#define UTIL_MACROS_H
+
+/* Compute the size of an array */
+#ifndef ARRAY_SIZE
+#  define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
+#endif
+
+/* For compatibility with Clang's __has_builtin() */
+#ifndef __has_builtin
+#  define __has_builtin(x) 0
+#endif
+
+/**
+ * __builtin_expect macros
+ */
+#if !defined(HAVE___BUILTIN_EXPECT)
+#  define __builtin_expect(x, y) (x)
+#endif
+
+#ifndef likely
+#  ifdef HAVE___BUILTIN_EXPECT
+#    define likely(x)   __builtin_expect(!!(x), 1)
+#    define unlikely(x) __builtin_expect(!!(x), 0)
+#  else
+#    define likely(x)   (x)
+#    define unlikely(x) (x)
+#  endif
+#endif
+
+
+/**
+ * Static (compile-time) assertion.
+ * Basically, use COND to dimension an array.  If COND is false/zero the
+ * array size will be -1 and we'll get a compilation error.
+ */
+#define STATIC_ASSERT(COND) \
+   do { \
+      (void) sizeof(char [1 - 2*!(COND)]); \
+   } while (0)
+
+
+/**
+ * Unreachable macro. Useful for suppressing "control reaches end of non-void
+ * function" warnings.
+ */
+#ifdef HAVE___BUILTIN_UNREACHABLE
+#define unreachable(str)    \
+do {                        \
+   assert(!str);            \
+   __builtin_unreachable(); \
+} while (0)
+#elif defined (_MSC_VER)
+#define unreachable(str)    \
+do {                        \
+   assert(!str);            \
+   __assume(0);             \
+} while (0)
+#else
+#define unreachable(str) assert(!str)
+#endif
+
+/**
+ * Assume macro. Useful for expressing our assumptions to the compiler,
+ * typically for purposes of silencing warnings.
+ */
+#if __has_builtin(__builtin_assume)
+#define assume(expr)       \
+do {                       \
+   assert(expr);           \
+   __builtin_assume(expr); \
+} while (0)
+#elif defined HAVE___BUILTIN_UNREACHABLE
+#define assume(expr) ((expr) ? ((void) 0) \
+                             : (assert(!"assumption failed"), \
+                                __builtin_unreachable()))
+#elif defined (_MSC_VER)
+#define assume(expr) __assume(expr)
+#else
+#define assume(expr) assert(expr)
+#endif
+
+#ifdef HAVE_FUNC_ATTRIBUTE_FLATTEN
+#define FLATTEN __attribute__((__flatten__))
+#else
+#define FLATTEN
+#endif
+
+#ifdef HAVE_FUNC_ATTRIBUTE_FORMAT
+#define PRINTFLIKE(f, a) __attribute__ ((format(__printf__, f, a)))
+#else
+#define PRINTFLIKE(f, a)
+#endif
+
+#ifdef HAVE_FUNC_ATTRIBUTE_MALLOC
+#define MALLOCLIKE __attribute__((__malloc__))
+#else
+#define MALLOCLIKE
+#endif
+
+/* Used to optionally mark structures with misaligned elements or size as
+ * packed, to trade off performance for space.
+ */
+#ifdef HAVE_FUNC_ATTRIBUTE_PACKED
+#define PACKED __attribute__((__packed__))
+#else
+#define PACKED
+#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
+
+/**
+ * PUBLIC/USED macros
+ *
+ * If we build the library with gcc's -fvisibility=hidden flag, we'll
+ * use the PUBLIC macro to mark functions that are to be exported.
+ *
+ * We also need to define a USED attribute, so the optimizer doesn't
+ * inline a static function that we later use in an alias. - ajax
+ */
+#ifndef PUBLIC
+#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#    define PUBLIC __attribute__((visibility("default")))
+#    define USED __attribute__((used))
+#  elif defined(_MSC_VER)
+#    define PUBLIC __declspec(dllexport)
+#    define USED
+#  else
+#    define PUBLIC
+#    define USED
+#  endif
+#endif
+
+#ifdef HAVE_FUNC_ATTRIBUTE_UNUSED
+#define UNUSED __attribute__((unused))
+#else
+#define UNUSED
+#endif
+
+
+#endif /* UTIL_MACROS_H */
diff --git a/xorg-server/hw/dmx/input/dmxevents.c b/xorg-server/hw/dmx/input/dmxevents.c
index 14ac05f5c..2b579ee87 100644
--- a/xorg-server/hw/dmx/input/dmxevents.c
+++ b/xorg-server/hw/dmx/input/dmxevents.c
@@ -488,12 +488,9 @@ dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
     switch (type) {
     case XI_DeviceKeyPress:
     case XI_DeviceKeyRelease:
-        EXTRACT_VALUATORS(ke, valuators);
-        valuator_mask_set_range(&mask, ke->first_axis, ke->axes_count,
-                                valuators);
         if (block)
             OsBlockSIGIO();
-        QueueKeyboardEvents(pDevice, event, ke->keycode, &mask);
+        QueueKeyboardEvents(pDevice, event, ke->keycode);
         if (block)
             OsReleaseSIGIO();
         break;
@@ -718,7 +715,7 @@ dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
             detail = dmxFixup(pDev, detail, keySym);
 
         /*ErrorF("KEY %d  sym %d\n", detail, (int) keySym); */
-        QueueKeyboardEvents(p, type, detail, NULL);
+        QueueKeyboardEvents(p, type, detail);
         return;
 
     case ButtonPress:
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index 31a5e04d2..cb69f77b9 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -1854,7 +1854,7 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo * ki,
         else
             type = KeyPress;
 
-        QueueKeyboardEvents(ki->dixdev, type, key_code, NULL);
+        QueueKeyboardEvents(ki->dixdev, type, key_code);
     }
     else {
         ErrorF("driver %s wanted to post scancode %d outside of [%d, %d]!\n",
diff --git a/xorg-server/hw/xfree86/common/xf86Events.c b/xorg-server/hw/xfree86/common/xf86Events.c
index 16b3e2821..c06aaaee1 100644
--- a/xorg-server/hw/xfree86/common/xf86Events.c
+++ b/xorg-server/hw/xfree86/common/xf86Events.c
@@ -403,7 +403,7 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
          i < keyc->xkbInfo->desc->max_key_code; i++) {
         if (key_is_down(pDev, i, KEY_POSTED)) {
             OsBlockSIGIO();
-            QueueKeyboardEvents(pDev, KeyRelease, i, NULL);
+            QueueKeyboardEvents(pDev, KeyRelease, i);
             OsReleaseSIGIO();
         }
     }
diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index e68fe9cba..25a8869b0 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -81,7 +81,7 @@ typedef enum {
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
 #define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(19, 0)
-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(21, 0)
+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(22, 0)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(9, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
 
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index 1fb5b1635..9fa3dc43c 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -1326,47 +1326,21 @@ xf86PostButtonEventM(DeviceIntPtr device,
 }
 
 void
-xf86PostKeyEvent(DeviceIntPtr device,
-                 unsigned int key_code,
-                 int is_down,
-                 int is_absolute, int first_valuator, int num_valuators, ...)
+xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down)
 {
-    va_list var;
-    int i = 0;
-    ValuatorMask mask;
-
-    XI_VERIFY_VALUATORS(num_valuators);
-
-    valuator_mask_zero(&mask);
-
-    va_start(var, num_valuators);
-    for (i = 0; i < num_valuators; i++)
-        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
-
-    va_end(var);
-
-    xf86PostKeyEventM(device, key_code, is_down, is_absolute, &mask);
+    xf86PostKeyEventM(device, key_code, is_down);
 }
 
 void
 xf86PostKeyEventP(DeviceIntPtr device,
                   unsigned int key_code,
-                  int is_down,
-                  int is_absolute,
-                  int first_valuator, int num_valuators, const int *valuators)
+                  int is_down)
 {
-    ValuatorMask mask;
-
-    XI_VERIFY_VALUATORS(num_valuators);
-
-    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);
-    xf86PostKeyEventM(device, key_code, is_down, is_absolute, &mask);
+    xf86PostKeyEventM(device, key_code, is_down);
 }
 
 void
-xf86PostKeyEventM(DeviceIntPtr device,
-                  unsigned int key_code,
-                  int is_down, int is_absolute, const ValuatorMask *mask)
+xf86PostKeyEventM(DeviceIntPtr device, unsigned int key_code, int is_down)
 {
 #if XFreeXDGA
     DeviceIntPtr pointer;
@@ -1382,8 +1356,7 @@ xf86PostKeyEventM(DeviceIntPtr device,
     }
 #endif
 
-    QueueKeyboardEvents(device,
-                        is_down ? KeyPress : KeyRelease, key_code, mask);
+    QueueKeyboardEvents(device, is_down ? KeyPress : KeyRelease, key_code);
 }
 
 void
@@ -1392,7 +1365,7 @@ xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, int is_down)
     ValuatorMask mask;
 
     valuator_mask_zero(&mask);
-    xf86PostKeyEventM(device, key_code, is_down, 0, &mask);
+    xf86PostKeyEventM(device, key_code, is_down);
 }
 
 InputInfoPtr
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h
index 42d66d22e..0024053c7 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.h
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.h
@@ -148,18 +148,11 @@ extern _X_EXPORT void xf86PostButtonEventM(DeviceIntPtr device, int is_absolute,
                                            int button, int is_down,
                                            const ValuatorMask *mask);
 extern _X_EXPORT void xf86PostKeyEvent(DeviceIntPtr device,
-                                       unsigned int key_code, int is_down,
-                                       int is_absolute, int first_valuator,
-                                       int num_valuators, ...);
+                                       unsigned int key_code, int is_down);
 extern _X_EXPORT void xf86PostKeyEventM(DeviceIntPtr device,
-                                        unsigned int key_code, int is_down,
-                                        int is_absolute,
-                                        const ValuatorMask *mask);
+                                        unsigned int key_code, int is_down);
 extern _X_EXPORT void xf86PostKeyEventP(DeviceIntPtr device,
-                                        unsigned int key_code, int is_down,
-                                        int is_absolute, int first_valuator,
-                                        int num_valuators,
-                                        const int *valuators);
+                                        unsigned int key_code, int is_down);
 extern _X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device,
                                             unsigned int key_code, int is_down);
 extern _X_EXPORT void xf86PostTouchEvent(DeviceIntPtr dev, uint32_t touchid,
diff --git a/xorg-server/hw/xfree86/int10/generic.c b/xorg-server/hw/xfree86/int10/generic.c
index 012d1941a..8d5c4daf3 100644
--- a/xorg-server/hw/xfree86/int10/generic.c
+++ b/xorg-server/hw/xfree86/int10/generic.c
@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len)
 {
     void *map;
 
-    if (!pci_device_map_legacy(dev, 0, len, 0, &map))
+    if (pci_device_map_legacy(dev, 0, len, 0, &map))
         return FALSE;
 
     memcpy(buf, map, len);
diff --git a/xorg-server/hw/xfree86/os-support/linux/int10/linux.c b/xorg-server/hw/xfree86/os-support/linux/int10/linux.c
index 79b9a8858..6ca118f25 100644
--- a/xorg-server/hw/xfree86/os-support/linux/int10/linux.c
+++ b/xorg-server/hw/xfree86/os-support/linux/int10/linux.c
@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len)
 {
     void *map;
 
-    if (!pci_device_map_legacy(dev, base, len, 0, &map))
+    if (pci_device_map_legacy(dev, base, len, 0, &map))
         return FALSE;
 
     memcpy(buf, map, len);
diff --git a/xorg-server/hw/xfree86/sdksyms.sh b/xorg-server/hw/xfree86/sdksyms.sh
index 2305073a0..05ac41096 100644
--- a/xorg-server/hw/xfree86/sdksyms.sh
+++ b/xorg-server/hw/xfree86/sdksyms.sh
@@ -350,13 +350,25 @@ BEGIN {
     if (sdk) {
 	n = 3;
 
+        # skip line numbers GCC 5 adds before __attribute__
+        while ($n == "" || $0 ~ /^# [0-9]+ "/) {
+           getline;
+           n = 1;
+        }
+
 	# skip attribute, if any
 	while ($n ~ /^(__attribute__|__global)/ ||
 	    # skip modifiers, if any
 	    $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ ||
 	    # skip pointer
-	    $n ~ /^[a-zA-Z0-9_]*\*$/)
+	    $n ~ /^[a-zA-Z0-9_]*\*$/) {
 	    n++;
+            # skip line numbers GCC 5 adds after __attribute__
+            while ($n == "" || $0 ~ /^# [0-9]+ "/) {
+               getline;
+               n = 1;
+            }
+        }
 
 	# type specifier may not be set, as in
 	#   extern _X_EXPORT unsigned name(...)
diff --git a/xorg-server/hw/xnest/Events.c b/xorg-server/hw/xnest/Events.c
index 3ff095bb8..f727557ba 100644
--- a/xorg-server/hw/xnest/Events.c
+++ b/xorg-server/hw/xnest/Events.c
@@ -103,7 +103,7 @@ void
 xnestQueueKeyEvent(int type, unsigned int keycode)
 {
     lastEventTime = GetTimeInMillis();
-    QueueKeyboardEvents(xnestKeyboardDevice, type, keycode, NULL);
+    QueueKeyboardEvents(xnestKeyboardDevice, type, keycode);
 }
 
 void
diff --git a/xorg-server/hw/xquartz/darwinEvents.c b/xorg-server/hw/xquartz/darwinEvents.c
index 5a5e4dad2..9bf2f14ee 100644
--- a/xorg-server/hw/xquartz/darwinEvents.c
+++ b/xorg-server/hw/xquartz/darwinEvents.c
@@ -456,8 +456,7 @@ DarwinInputReleaseButtonsAndKeys(DeviceIntPtr pDev)
         if (pDev->key) {
             for (i = 0; i < NUM_KEYCODES; i++) {
                 if (BitIsOn(pDev->key->down, i + MIN_KEYCODE)) {
-                    QueueKeyboardEvents(pDev, KeyRelease, i + MIN_KEYCODE,
-                                        NULL);
+                    QueueKeyboardEvents(pDev, KeyRelease, i + MIN_KEYCODE);
                 }
             }
         }
@@ -611,8 +610,7 @@ DarwinSendKeyboardEvents(int ev_type, int keycode)
 
     darwinEvents_lock();
     {
-        QueueKeyboardEvents(darwinKeyboard, ev_type, keycode + MIN_KEYCODE,
-                            NULL);
+        QueueKeyboardEvents(darwinKeyboard, ev_type, keycode + MIN_KEYCODE);
         DarwinPokeEQ();
     } darwinEvents_unlock();
 }
diff --git a/xorg-server/hw/xwayland/xwayland-input.c b/xorg-server/hw/xwayland/xwayland-input.c
index 5e204189f..cc3bc53c8 100644
--- a/xorg-server/hw/xwayland/xwayland-input.c
+++ b/xorg-server/hw/xwayland/xwayland-input.c
@@ -323,7 +323,6 @@ keyboard_handle_key(void *data, struct wl_keyboard *keyboard, uint32_t serial,
 {
     struct xwl_seat *xwl_seat = data;
     uint32_t *k, *end;
-    ValuatorMask mask;
 
     xwl_seat->xwl_screen->serial = serial;
 
@@ -338,9 +337,8 @@ keyboard_handle_key(void *data, struct wl_keyboard *keyboard, uint32_t serial,
         *k = key;
     }
 
-    valuator_mask_zero(&mask);
     QueueKeyboardEvents(xwl_seat->keyboard,
-                        state ? KeyPress : KeyRelease, key + 8, &mask);
+                        state ? KeyPress : KeyRelease, key + 8);
 }
 
 static void
@@ -393,16 +391,14 @@ keyboard_handle_enter(void *data, struct wl_keyboard *keyboard,
                       struct wl_surface *surface, struct wl_array *keys)
 {
     struct xwl_seat *xwl_seat = data;
-    ValuatorMask mask;
     uint32_t *k;
 
     xwl_seat->xwl_screen->serial = serial;
     xwl_seat->keyboard_focus = surface;
 
     wl_array_copy(&xwl_seat->keys, keys);
-    valuator_mask_zero(&mask);
     wl_array_for_each(k, &xwl_seat->keys)
-        QueueKeyboardEvents(xwl_seat->keyboard, KeyPress, *k + 8, &mask);
+        QueueKeyboardEvents(xwl_seat->keyboard, KeyPress, *k + 8);
 }
 
 static void
@@ -410,14 +406,12 @@ keyboard_handle_leave(void *data, struct wl_keyboard *keyboard,
                       uint32_t serial, struct wl_surface *surface)
 {
     struct xwl_seat *xwl_seat = data;
-    ValuatorMask mask;
     uint32_t *k;
 
     xwl_seat->xwl_screen->serial = serial;
 
-    valuator_mask_zero(&mask);
     wl_array_for_each(k, &xwl_seat->keys)
-        QueueKeyboardEvents(xwl_seat->keyboard, KeyRelease, *k + 8, &mask);
+        QueueKeyboardEvents(xwl_seat->keyboard, KeyRelease, *k + 8);
 
     xwl_seat->keyboard_focus = NULL;
 }
diff --git a/xorg-server/hw/xwin/winkeybd.c b/xorg-server/hw/xwin/winkeybd.c
index d76ed005e..7f0e54008 100644
--- a/xorg-server/hw/xwin/winkeybd.c
+++ b/xorg-server/hw/xwin/winkeybd.c
@@ -516,7 +516,7 @@ winSendKeyEvent(DWORD dwKey, Bool fDown)
     g_winKeyState[dwKey] = fDown;
 
     QueueKeyboardEvents(g_pwinKeyboard, fDown ? KeyPress : KeyRelease,
-                        dwKey + MIN_KEYCODE, NULL);
+                        dwKey + MIN_KEYCODE);
 
     winDebug("winSendKeyEvent: dwKey: %d, fDown: %d\n", dwKey, fDown);
 }
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index 605e38310..ceb665aa8 100755
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -448,12 +448,11 @@ extern _X_EXPORT void QueuePointerEvents(DeviceIntPtr pDev,
 extern _X_EXPORT int GetKeyboardEvents(InternalEvent *events,
                                        DeviceIntPtr pDev,
                                        int type,
-                                       int key_code, const ValuatorMask *mask);
+                                       int key_code);
 
 extern _X_EXPORT void QueueKeyboardEvents(DeviceIntPtr pDev,
                                           int type,
-                                          int key_code,
-                                          const ValuatorMask *mask);
+                                          int key_code);
 
 extern int GetTouchEvents(InternalEvent *events,
                           DeviceIntPtr pDev,
@@ -505,7 +504,7 @@ extern int AttachDevice(ClientPtr client,
                         DeviceIntPtr slave, DeviceIntPtr master);
 
 extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
-extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
+extern _X_EXPORT DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
 
 extern _X_EXPORT int AllocDevicePair(ClientPtr client,
                                      const char *name,
diff --git a/xorg-server/os/access.c b/xorg-server/os/access.c
index 3ac3160b4..23eb404ed 100644
--- a/xorg-server/os/access.c
+++ b/xorg-server/os/access.c
@@ -1569,7 +1569,7 @@ InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client)
     }
     for (host = validhosts; host; host = host->next) {
         if (host->family == FamilyServerInterpreted) {
-            if (addr && siAddrMatch(family, addr, len, host, client)) {
+            if (siAddrMatch(family, addr, len, host, client)) {
                 return 0;
             }
         }
diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c
index 6ebfa453b..7374662e4 100755
--- a/xorg-server/os/connection.c
+++ b/xorg-server/os/connection.c
@@ -550,8 +550,13 @@ CloseWellKnownConnections(void)
 {
     int i;
 
-    for (i = 0; i < ListenTransCount; i++)
-        _XSERVTransClose(ListenTransConns[i]);
+    for (i = 0; i < ListenTransCount; i++) {
+        if (ListenTransConns[i] != NULL) {
+            _XSERVTransClose(ListenTransConns[i]);
+            ListenTransConns[i] = NULL;
+        }
+    }
+    ListenTransCount = 0;
 }
 
 static void
author	marha <marha@users.sourceforge.net>	2015-03-22 14:10:47 +0100
committer	marha <marha@users.sourceforge.net>	2015-03-22 14:10:47 +0100
commit	3bc24b271f45f9f33484b8cf53b44f33f7e8a237 (patch)
tree	193651a94adb3804e800747e993d07b92688e4d4
parent	c646056120fe14e4c4ccf81bac5d78d61225a8e8 (diff)
parent	82c8df11062f72a7d467e26cedbbd8b322ff7a70 (diff)
download	vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.gz vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.bz2 vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.zip